diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-12-08 13:58:58 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-12-08 13:58:58 -0500 |
| commit | 81c412600f946fc1c8731685cb6c6fae8002043a (patch) | |
| tree | 87bbdf52615ec4ee6003b69e74ea330ca1427e46 /drivers/net/wireless/brcm80211/brcmfmac/usb.c | |
| parent | fc99dd0829fd4d080b78141ade9a79bcc3dcd160 (diff) | |
| parent | 87141db0848aa20c43d453f5545efc8f390d4372 (diff) | |
| download | talos-obmc-linux-81c412600f946fc1c8731685cb6c6fae8002043a.tar.gz talos-obmc-linux-81c412600f946fc1c8731685cb6c6fae8002043a.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/usb.c')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/usb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c index 5265aa70b094..4572defc280f 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c @@ -738,10 +738,12 @@ static int brcmf_usb_dl_cmd(struct brcmf_usbdev_info *devinfo, u8 cmd, goto finalize; } - if (!brcmf_usb_ioctl_resp_wait(devinfo)) + if (!brcmf_usb_ioctl_resp_wait(devinfo)) { + usb_kill_urb(devinfo->ctl_urb); ret = -ETIMEDOUT; - else + } else { memcpy(buffer, tmpbuf, buflen); + } finalize: kfree(tmpbuf); |
