From 99bcfbba8038edccffa706132b5f0c63f9e7196f Mon Sep 17 00:00:00 2001 From: Hante Meuleman Date: Thu, 30 Aug 2012 19:42:58 +0200 Subject: [PATCH] --- yaml --- r: 327911 b: refs/heads/master c: a77f57475465b1958f167c78dc94288ea0ba1b9c h: refs/heads/master i: 327909: 771e09d0b9740dcadd0dd6a4765b8993f2ec0cea 327907: 9c498e5d2fa1687efa550bc4be7bbb7c73b7ff00 327903: c28011000c702095eb68dc9e4bad8214b01532d6 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b1c3d375dda9..e8a30b71de8b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: adfbda62248258a402253744e4eed6b87fb43169 +refs/heads/master: a77f57475465b1958f167c78dc94288ea0ba1b9c diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c index a299d42da8e7..ac1ed1fdff94 100644 --- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c +++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c @@ -366,13 +366,13 @@ static int brcmf_usb_tx_ctlpkt(struct device *dev, u8 *buf, u32 len) if (test_and_set_bit(0, &devinfo->ctl_op)) return -EIO; + devinfo->ctl_completed = false; err = brcmf_usb_send_ctl(devinfo, buf, len); if (err) { brcmf_dbg(ERROR, "fail %d bytes: %d\n", err, len); return err; } - devinfo->ctl_completed = false; timeout = brcmf_usb_ioctl_resp_wait(devinfo, &devinfo->ctl_completed, &pending); clear_bit(0, &devinfo->ctl_op);