---

yaml
---
r: 233135
b: refs/heads/master
c: d247852
h: refs/heads/master
i:
  233133: 632defc
  233131: 1932a62
  233127: ee471a3
  233119: d54cf07
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee24aebffb75a7f940cf52c8cf6910947b3130c0
+refs/heads/master: d2478521afc20227658a10a8c5c2bf1a2aa615b3

trunk/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)
 	mutex_lock(&smi_infos_lock);
 	if (unload_when_empty && list_empty(&smi_infos)) {
 		mutex_unlock(&smi_infos_lock);
-#ifdef CONFIG_PCI
-		if (pci_registered)
-			pci_unregister_driver(&ipmi_pci_driver);
-#endif
-
-#ifdef CONFIG_PPC_OF
-		if (of_registered)
-			of_unregister_platform_driver(&ipmi_of_platform_driver);
-#endif
-		driver_unregister(&ipmi_driver.driver);
+		cleanup_ipmi_si();
 		printk(KERN_WARNING PFX
 		       "Unable to find any System Interface(s)\n");
 		return -ENODEV;