Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 278251
b: refs/heads/master
c: eb1852b
h: refs/heads/master
i:
  278249: fc814ae
  278247: 03b781c
v: v3
  • Loading branch information
John W. Linville committed Nov 22, 2011
1 parent d74a25a commit 3fae2a2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 515db09338704a6ad7d27b5f1e33820d3052edd2
refs/heads/master: eb1852b10593dc3ca73e02bf9ac4753a5a464905
5 changes: 3 additions & 2 deletions trunk/drivers/net/wireless/rtlwifi/usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ static int _usbctrl_vendorreq_sync_read(struct usb_device *udev, u8 request,
pipe = usb_rcvctrlpipe(udev, 0); /* read_in */
reqtype = REALTEK_USB_VENQT_READ;

while (++vendorreq_times <= MAX_USBCTRL_VENDORREQ_TIMES) {
do {
status = usb_control_msg(udev, pipe, request, reqtype, value,
index, pdata, len, 0); /*max. timeout*/
if (status < 0) {
Expand All @@ -119,7 +119,8 @@ static int _usbctrl_vendorreq_sync_read(struct usb_device *udev, u8 request,
} else {
break;
}
}
} while (++vendorreq_times < MAX_USBCTRL_VENDORREQ_TIMES);

if (status < 0 && count++ < 4)
pr_err("reg 0x%x, usbctrl_vendorreq TimeOut! status:0x%x value=0x%x\n",
value, status, le32_to_cpu(*(u32 *)pdata));
Expand Down

0 comments on commit 3fae2a2

Please sign in to comment.