summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Krafft2007-05-12 19:37:01 +0200
committerLinus Torvalds2007-05-12 19:55:40 +0200
commit10fb62e5b72c2485c3e0efd8b103254c0d087676 (patch)
tree967bad39b01a7927ddbf6571b18ee5fcef8506c1
parentIPMI: fix SI address space settings (diff)
downloadkernel-qcow2-linux-10fb62e5b72c2485c3e0efd8b103254c0d087676.tar.gz
kernel-qcow2-linux-10fb62e5b72c2485c3e0efd8b103254c0d087676.tar.xz
kernel-qcow2-linux-10fb62e5b72c2485c3e0efd8b103254c0d087676.zip
IPMI: Add PPC openfirmware unregister
When trying to load the ipmi_si module on a powerpc with no BMC (baseboard management controller) the driver failes to load correctly, but doesn't unregister itself from of_platform. So, on a second modprobe the kernel crashes. This patch adds the missing unregister call. Signed-off-by: Christian Krafft <krafft@de.ibm.com> Signed-off-by: Corey Minyard <minyard@acm.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/char/ipmi/ipmi_si_intf.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 4769cc268806..78e1b962fe35 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2974,6 +2974,10 @@ static __devinit int init_ipmi_si(void)
#ifdef CONFIG_PCI
pci_unregister_driver(&ipmi_pci_driver);
#endif
+
+#ifdef CONFIG_PPC_OF
+ of_unregister_platform_driver(&ipmi_of_platform_driver);
+#endif
driver_unregister(&ipmi_driver);
printk("ipmi_si: Unable to find any System Interface(s)\n");
return -ENODEV;