Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6c463e3 authored by Michael Buesch's avatar Michael Buesch Committed by John W. Linville
Browse files

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



SSB modinit should not succeed, if busattach failed.

Signed-off-by: default avatarMichael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 69eddc8a

drivers/ssb/main.c

+4 −2
Original line number Diff line number Diff line
@@ -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.