diff options
author | Michael Buesch <mb@bu3sch.de> | 2009-09-05 05:18:47 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-09-08 16:31:08 -0400 |
commit | e6c463e3a3d067f5da2c79d5acdb2f626754cdb3 (patch) | |
tree | c469a4411d61f47b4b24387a9d3d87c68648ecd6 /drivers | |
parent | 69eddc8a37a33479205ac3a3d8575fad1466da90 (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ssb/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c index 65a1ed951a1d..8d16cb258ccf 100644 --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c | |||
@@ -1358,8 +1358,10 @@ static int __init ssb_modinit(void) | |||
1358 | ssb_buses_lock(); | 1358 | ssb_buses_lock(); |
1359 | err = ssb_attach_queued_buses(); | 1359 | err = ssb_attach_queued_buses(); |
1360 | ssb_buses_unlock(); | 1360 | ssb_buses_unlock(); |
1361 | if (err) | 1361 | if (err) { |
1362 | bus_unregister(&ssb_bustype); | 1362 | bus_unregister(&ssb_bustype); |
1363 | goto out; | ||
1364 | } | ||
1363 | 1365 | ||
1364 | err = b43_pci_ssb_bridge_init(); | 1366 | err = b43_pci_ssb_bridge_init(); |
1365 | if (err) { | 1367 | if (err) { |
@@ -1375,7 +1377,7 @@ static int __init ssb_modinit(void) | |||
1375 | /* don't fail SSB init because of this */ | 1377 | /* don't fail SSB init because of this */ |
1376 | err = 0; | 1378 | err = 0; |
1377 | } | 1379 | } |
1378 | 1380 | out: | |
1379 | return err; | 1381 | return err; |
1380 | } | 1382 | } |
1381 | /* ssb must be initialized after PCI but before the ssb drivers. | 1383 | /* ssb must be initialized after PCI but before the ssb drivers. |