From b6be10a20c7374cf533f4226c93a54659e73e64c Mon Sep 17 00:00:00 2001 From: Hante Meuleman Date: Wed, 19 Sep 2012 22:21:16 +0200 Subject: [PATCH] --- yaml --- r: 328251 b: refs/heads/master c: 6385df2db76c48d04530395a67c16b03afcc4095 h: refs/heads/master i: 328249: 7dcbb071259fa0b531d3bdffd546f8c7c526be53 328247: a2e7f99a471e39f33c64200dd420f227d1584a8d v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d227bf54a35c..d823b15ee830 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82d8eba358badb466a4e988ecabf0668a8d92e9c +refs/heads/master: 6385df2db76c48d04530395a67c16b03afcc4095 diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c index 246d06bb573a..5fe6ec7f838e 100644 --- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c +++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c @@ -337,6 +337,7 @@ static int brcmf_usb_tx_ctlpkt(struct device *dev, u8 *buf, u32 len) err = brcmf_usb_send_ctl(devinfo, buf, len); if (err) { brcmf_dbg(ERROR, "fail %d bytes: %d\n", err, len); + clear_bit(0, &devinfo->ctl_op); return err; } @@ -367,6 +368,7 @@ static int brcmf_usb_rx_ctlpkt(struct device *dev, u8 *buf, u32 len) err = brcmf_usb_recv_ctl(devinfo, buf, len); if (err) { brcmf_dbg(ERROR, "fail %d bytes: %d\n", err, len); + clear_bit(0, &devinfo->ctl_op); return err; } devinfo->ctl_completed = false;