path: root/drivers
diff options
authorCorey Minyard <minyard@acm.org>2011-02-10 16:08:38 -0600
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-10 18:00:21 -0800
commitd2478521afc20227658a10a8c5c2bf1a2aa615b3 (patch)
tree4131c840f6a01061a3dd65264ed2497178960df8 /drivers
parentee24aebffb75a7f940cf52c8cf6910947b3130c0 (diff)
char/ipmi: fix OOPS caused by pnp_unregister_driver on unregistered driver
This patch fixes an OOPS triggered when calling modprobe ipmi_si a second time after the first modprobe returned without finding any ipmi devices. This can happen if you reload the module after having the first module load fail. The driver was not deregistering from PNP in that case. Peter Huewe originally reported this patch and supplied a fix, I have a different patch based on Linus' suggestion that cleans things up a bit more. Cc: stable@kernel.org Cc: openipmi-developer@lists.sourceforge.net Reviewed-by: Peter Huewe <peterhuewe@gmx.de> Cc: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Corey Minyard <cminyard@mvista.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index b6ae6e9a9c5..7855f9f45b8 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -320,6 +320,7 @@ static int unload_when_empty = 1;
static int add_smi(struct smi_info *smi);
static int try_smi_init(struct smi_info *smi);
static void cleanup_one_si(struct smi_info *to_clean);
+static void cleanup_ipmi_si(void);
static ATOMIC_NOTIFIER_HEAD(xaction_notifier_list);
static int register_xaction_notifier(struct notifier_block *nb)
@@ -3450,16 +3451,7 @@ static int __devinit init_ipmi_si(void)
if (unload_when_empty && list_empty(&smi_infos)) {
-#ifdef CONFIG_PCI
- if (pci_registered)
- pci_unregister_driver(&ipmi_pci_driver);
- if (of_registered)
- of_unregister_platform_driver(&ipmi_of_platform_driver);
- driver_unregister(&ipmi_driver.driver);
+ cleanup_ipmi_si();
"Unable to find any System Interface(s)\n");
return -ENODEV;