diff options
| author | David S. Miller <davem@davemloft.net> | 2013-02-09 00:02:14 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-09 00:02:14 +0100 |
| commit | fd5023111cf720db890ef34f305ac5d427e690a0 (patch) | |
| tree | 4d21e9a02bfbdafe5fc598af0755db791238dbe7 /drivers/ssb/main.c | |
| parent | cxgb4vf: Fix extraction of cpl_rx_pkt from the response queue descriptor (diff) | |
| parent | Linux 3.8-rc7 (diff) | |
| download | linux-fd5023111cf720db890ef34f305ac5d427e690a0.tar.xz linux-fd5023111cf720db890ef34f305ac5d427e690a0.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Synchronize with 'net' in order to sort out some l2tp, wireless, and
ipv6 GRE fixes that will be built on top of in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
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 9987d9f366f4..3b645b8a261f 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); |