diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-02-06 13:55:44 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-02-06 13:55:44 -0500 |
commit | b3b66ae4c8aff0636521034d824b8953dc617335 (patch) | |
tree | 0a4c792efd730a59adc79d0d2476e0a4b3aa2f2e /drivers/ssb/main.c | |
parent | bf414b369f158bb527f9f29174ada815f961b44c (diff) | |
parent | 7b2385b95363c9ff49801c19cba2489a05bd6672 (diff) | |
download | linux-b3b66ae4c8aff0636521034d824b8953dc617335.tar.bz2 |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/ssb/main.c')
-rw-r--r-- | drivers/ssb/main.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c index 772ad9b5c304..24dc331b4701 100644 --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c @@ -443,6 +443,15 @@ static void ssb_devices_unregister(struct ssb_bus *bus) void ssb_bus_unregister(struct ssb_bus *bus) { + int err; + + err = ssb_gpio_unregister(bus); + if (err == -EBUSY) + ssb_dprintk(KERN_ERR PFX "Some GPIOs are still in use.\n"); + else if (err) + ssb_dprintk(KERN_ERR PFX + "Can not unregister GPIO driver: %i\n", err); + ssb_buses_lock(); ssb_devices_unregister(bus); list_del(&bus->list); |