diff options
| author | Arend van Spriel <arend@broadcom.com> | 2013-04-03 14:40:48 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-04-03 23:07:08 +0400 |
| commit | 47829f4fc4825ad3a50389a682a6ea954664ba79 (patch) | |
| tree | 78d1df7bc78e8145b32ebff14b461745fd558aba /drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | |
| parent | d9337414e87259fae13693796f7ad897b1b7f8e1 (diff) | |
| download | linux-47829f4fc4825ad3a50389a682a6ea954664ba79.tar.xz | |
brcmfmac: only allocate firmware-signalling resources if required
Bail out of brcmf_fws_init() when no firmware-signalling is asked
for. Need to take this into account in brcmf_fws_deinit() as well.
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Piotr Haber <phaber@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c index d37620e93e61..c82f3e0b66f9 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c @@ -982,8 +982,7 @@ void brcmf_detach(struct device *dev) if (drvr->prot) brcmf_proto_detach(drvr); - if (drvr->fws) - brcmf_fws_deinit(drvr); + brcmf_fws_deinit(drvr); brcmf_debugfs_detach(drvr); bus_if->drvr = NULL; |