ssb: Fail ssb modinit, if attach of the buses failed.
SSB modinit should not succeed, if busattach failed. Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
69eddc8a37
commit
e6c463e3a3
|
@ -1358,8 +1358,10 @@ static int __init ssb_modinit(void)
|
||||||
ssb_buses_lock();
|
ssb_buses_lock();
|
||||||
err = ssb_attach_queued_buses();
|
err = ssb_attach_queued_buses();
|
||||||
ssb_buses_unlock();
|
ssb_buses_unlock();
|
||||||
if (err)
|
if (err) {
|
||||||
bus_unregister(&ssb_bustype);
|
bus_unregister(&ssb_bustype);
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
err = b43_pci_ssb_bridge_init();
|
err = b43_pci_ssb_bridge_init();
|
||||||
if (err) {
|
if (err) {
|
||||||
|
@ -1375,7 +1377,7 @@ static int __init ssb_modinit(void)
|
||||||
/* don't fail SSB init because of this */
|
/* don't fail SSB init because of this */
|
||||||
err = 0;
|
err = 0;
|
||||||
}
|
}
|
||||||
|
out:
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
/* ssb must be initialized after PCI but before the ssb drivers.
|
/* ssb must be initialized after PCI but before the ssb drivers.
|
||||||
|
|
Loading…
Reference in New Issue