Skip to content

Commit 5debd33

Browse files
Shang XiaoJinggregkh
authored andcommitted
scsi: ipr: Fix WARNING in ipr_init()
[ Upstream commit e6f108b ] ipr_init() will not call unregister_reboot_notifier() when pci_register_driver() fails, which causes a WARNING. Call unregister_reboot_notifier() when pci_register_driver() fails. notifier callback ipr_halt [ipr] already registered WARNING: CPU: 3 PID: 299 at kernel/notifier.c:29 notifier_chain_register+0x16d/0x230 Modules linked in: ipr(+) xhci_pci_renesas xhci_hcd ehci_hcd usbcore led_class gpu_sched drm_buddy video wmi drm_ttm_helper ttm drm_display_helper drm_kms_helper drm drm_panel_orientation_quirks agpgart cfbft CPU: 3 PID: 299 Comm: modprobe Tainted: G W 6.1.0-rc1-00190-g39508d23b672-dirty torvalds#332 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.15.0-0-g2dd4b9b3f840-prebuilt.qemu.org 04/01/2014 RIP: 0010:notifier_chain_register+0x16d/0x230 Call Trace: <TASK> __blocking_notifier_chain_register+0x73/0xb0 ipr_init+0x30/0x1000 [ipr] do_one_initcall+0xdb/0x480 do_init_module+0x1cf/0x680 load_module+0x6a50/0x70a0 __do_sys_finit_module+0x12f/0x1c0 do_syscall_64+0x3f/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd Fixes: f72919e ("[SCSI] ipr: implement shutdown changes and remove obsolete write cache parameter") Signed-off-by: Shang XiaoJing <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Martin K. Petersen <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 76a5041 commit 5debd33

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

drivers/scsi/ipr.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10854,11 +10854,19 @@ static struct notifier_block ipr_notifier = {
1085410854
**/
1085510855
static int __init ipr_init(void)
1085610856
{
10857+
int rc;
10858+
1085710859
ipr_info("IBM Power RAID SCSI Device Driver version: %s %s\n",
1085810860
IPR_DRIVER_VERSION, IPR_DRIVER_DATE);
1085910861

1086010862
register_reboot_notifier(&ipr_notifier);
10861-
return pci_register_driver(&ipr_driver);
10863+
rc = pci_register_driver(&ipr_driver);
10864+
if (rc) {
10865+
unregister_reboot_notifier(&ipr_notifier);
10866+
return rc;
10867+
}
10868+
10869+
return 0;
1086210870
}
1086310871

1086410872
/**

0 commit comments

Comments
 (0)