From: Arnaud Patard <apatard@mandriva.com>
Date: Sat, 16 Sep 2006 19:15:36 +0000 (-0700)
Subject: [PATCH] IPMI: Fix oops on ipmi_msghandler removal for non ipmi systems
X-Git-Tag: v2.6.18~14^2~22
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=55ebcc38a5f6d40e4c41447e413ef842b803980f;p=linux-2.6-omap-h63xx.git

[PATCH] IPMI: Fix oops on ipmi_msghandler removal for non ipmi systems

When the ipmi_si module is loaded on a system without any ipmi device, it
fails with nodev.  It would be fine if all resources were freed.  A call to
device_unregister() is missing, resulting to a oops when you remove the
ipmi_msghandler.

Signed-off-by: Arnaud Patard <apatard@mandriva.com>
Acked-by: Corey Minyard <minyard@acm.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index f57eba0bf25..31b59403b63 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2481,6 +2481,7 @@ static __devinit int init_ipmi_si(void)
 #ifdef CONFIG_PCI
 		pci_unregister_driver(&ipmi_pci_driver);
 #endif
+		driver_unregister(&ipmi_driver);
 		printk("ipmi_si: Unable to find any System Interface(s)\n");
 		return -ENODEV;
 	} else {