diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-27 14:40:03 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-27 14:40:03 (GMT) |
| commit | dc1632321ba1e93dde25870e96cebe21b7d52517 (patch) | |
| tree | d52d934c79b23f91654c571d983e1a6ec41b71fd /drivers/net/wireless/zd1201.c | |
| parent | 8c193b8dce4f2a2474dc2bc39ec972454df9d439 (diff) | |
| parent | a85f9da707366e856c0aad9e329db0cc59475290 (diff) | |
| download | linux-fsl-qoriq-dc1632321ba1e93dde25870e96cebe21b7d52517.tar.xz | |
Merge remote-tracking branch 'asoc/topic/dmic' into asoc-core
Diffstat (limited to 'drivers/net/wireless/zd1201.c')
| -rw-r--r-- | drivers/net/wireless/zd1201.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c index 4941f20..b8ba1f9 100644 --- a/drivers/net/wireless/zd1201.c +++ b/drivers/net/wireless/zd1201.c @@ -98,10 +98,12 @@ static int zd1201_fw_upload(struct usb_device *dev, int apfw) goto exit; err = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), 0x4, - USB_DIR_IN | 0x40, 0,0, &ret, sizeof(ret), ZD1201_FW_TIMEOUT); + USB_DIR_IN | 0x40, 0, 0, buf, sizeof(ret), ZD1201_FW_TIMEOUT); if (err < 0) goto exit; + memcpy(&ret, buf, sizeof(ret)); + if (ret & 0x80) { err = -EIO; goto exit; |