ssb: Fail ssb modinit, if attach of the buses failed.

Commit Message

Michael Buesch Sept. 5, 2009, 9:18 a.m. UTC

SSB modinit should not succeed, if busattach failed.

Signed-off-by: Michael Buesch <[e-mail]>

---
 drivers/ssb/main.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Patch

--- wireless-testing.orig/drivers/ssb/main.c
+++ wireless-testing/drivers/ssb/main.c
@@ -1358,8 +1358,10 @@  static int __init ssb_modinit(void)
 	ssb_buses_lock();
 	err = ssb_attach_queued_buses();
 	ssb_buses_unlock();
-	if (err)
+	if (err) {
 		bus_unregister(&ssb_bustype);
+		goto out;
+	}
 
 	err = b43_pci_ssb_bridge_init();
 	if (err) {
@@ -1375,7 +1377,7 @@  static int __init ssb_modinit(void)
 		/* don't fail SSB init because of this */
 		err = 0;
 	}
-
+out:
 	return err;
 }
 /* ssb must be initialized after PCI but before the ssb drivers.