diff options
| author | John W. Linville | 2013-02-25 20:50:31 +0100 |
|---|---|---|
| committer | John W. Linville | 2013-02-25 20:50:31 +0100 |
| commit | 6d6436fbcbc43febe2481d3488f3bb5271ec2eb0 (patch) | |
| tree | 33d0526e5632b137a3d3d9134acb40cc06facaf6 /drivers/net/wireless/brcm80211 | |
| parent | net/pasemi: Fix missing coding style (diff) | |
| parent | brcmfmac: fix missing unlock on error in brcmf_notify_vif_event() (diff) | |
| download | kernel-qcow2-linux-6d6436fbcbc43febe2481d3488f3bb5271ec2eb0.tar.gz kernel-qcow2-linux-6d6436fbcbc43febe2481d3488f3bb5271ec2eb0.tar.xz kernel-qcow2-linux-6d6436fbcbc43febe2481d3488f3bb5271ec2eb0.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/brcm80211')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c index cecc3eff72e9..2af9c0f0798d 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c @@ -4615,8 +4615,10 @@ static s32 brcmf_notify_vif_event(struct brcmf_if *ifp, switch (ifevent->action) { case BRCMF_E_IF_ADD: /* waiting process may have timed out */ - if (!cfg->vif_event.vif) + if (!cfg->vif_event.vif) { + mutex_unlock(&event->vif_event_lock); return -EBADF; + } ifp->vif = vif; vif->ifp = ifp; |