X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fssb%2Fmain.c;h=8d16cb258ccfc3d89925575a740679dc0d635ffe;hb=e6c463e3a3d067f5da2c79d5acdb2f626754cdb3;hp=65a1ed951a1daa80abe1c9ac2b091af8664b38ad;hpb=418f19ea17a99421b22a64e101e14b6a16bed66d;p=~andy%2Flinux diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c index 65a1ed951a1..8d16cb258cc 100644 --- a/drivers/ssb/main.c +++ b/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.