diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-08 21:18:09 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-08 21:18:09 -0700 |
| commit | b37668d0808a1bf15d05e678f431fb5fb4659c90 (patch) | |
| tree | c53c3f1c7043e87954f4b253332a3f577f99d1ce /drivers/net/wireless/brcm80211/brcmfmac/fweh.c | |
| parent | 451372066dab1d98ba571b176bd1ce71922702f2 (diff) | |
| parent | 317ddd256b9c24b0d78fa8018f80f1e495481a10 (diff) | |
| download | blackbird-op-linux-b37668d0808a1bf15d05e678f431fb5fb4659c90.tar.gz blackbird-op-linux-b37668d0808a1bf15d05e678f431fb5fb4659c90.zip | |
Merge 3.10-rc5 into staging-next
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/fweh.c')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/fweh.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fweh.c b/drivers/net/wireless/brcm80211/brcmfmac/fweh.c index 5a64280e6485..83ee53a7c76e 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/fweh.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/fweh.c @@ -202,7 +202,8 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr, return; brcmf_fws_add_interface(ifp); if (!drvr->fweh.evt_handler[BRCMF_E_IF]) - err = brcmf_net_attach(ifp, false); + if (brcmf_net_attach(ifp, false) < 0) + return; } if (ifevent->action == BRCMF_E_IF_CHANGE) |
