diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-04 12:07:15 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-04 12:07:15 -0400 |
| commit | 6e1344e8088bd2de059a0fee4e15ddf6909fd833 (patch) | |
| tree | 53ba06e9f568fabdec3d6fae02c7a11025f7f6f5 /drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | |
| parent | 8af3994e23b02ef18bde7e5174ef6d902b402677 (diff) | |
| parent | 3c3052eac295678fd2765552c6a86d5441306cb4 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 1 |
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) | |||
| 2637 | /* after stopping the bus, exit thread */ | 2637 | /* after stopping the bus, exit thread */ |
| 2638 | brcmf_sdbrcm_bus_stop(bus->sdiodev->dev); | 2638 | brcmf_sdbrcm_bus_stop(bus->sdiodev->dev); |
| 2639 | bus->dpc_tsk = NULL; | 2639 | bus->dpc_tsk = NULL; |
| 2640 | spin_lock_irqsave(&bus->dpc_tl_lock, flags); | ||
| 2640 | break; | 2641 | break; |
| 2641 | } | 2642 | } |
| 2642 | 2643 | ||