summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFranky Lin <frankyl@broadcom.com>2012-04-30 11:43:07 -0700
committerJohn W. Linville <linville@tuxdriver.com>2012-05-02 14:02:03 -0400
commitcf04317227d0c53d931a0b963e7ac6f7f0125e8a (patch)
tree782655506b6a999b0f57c41bbb7ef6375716dd31
parent66f2c99af3d6f2d0aa1120884cf1c60613ef61c0 (diff)
downloadlinux-stable-cf04317227d0c53d931a0b963e7ac6f7f0125e8a.tar.gz
linux-stable-cf04317227d0c53d931a0b963e7ac6f7f0125e8a.tar.bz2
linux-stable-cf04317227d0c53d931a0b963e7ac6f7f0125e8a.zip
brcmfmac: fix a double spin_unlock_irqrestore issue in dpc
dpc_tl_lock is not acquired in the error handle code for bus down. But it's unlocked using spin_unlock_irqrestore after finishing task list walk down. Grab the lock before breaking the loop to avoid a double unlock. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index eb3829b03cd3..e2b34e1563f4 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -2637,6 +2637,7 @@ static int brcmf_sdbrcm_dpc_thread(void *data)
/* after stopping the bus, exit thread */
brcmf_sdbrcm_bus_stop(bus->sdiodev->dev);
bus->dpc_tsk = NULL;
+ spin_lock_irqsave(&bus->dpc_tl_lock, flags);
break;
}