rtlwifi: squash warning in _usb_read_sync
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 21 Nov 2011 21:37:26 +0000 (16:37 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Nov 2011 19:41:22 +0000 (14:41 -0500)
drivers/net/wireless/rtlwifi/usb.c: In function ‘_usb_read_sync’:
drivers/net/wireless/rtlwifi/usb.c:102:6: warning: ‘status’ may be used uninitialized in this function
drivers/net/wireless/rtlwifi/usb.c:102:6: note: ‘status’ was declared here

My compiler is dumb, but better to eliminate the warning than to have
anyone waste time evaluating this again...

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
drivers/net/wireless/rtlwifi/usb.c

index ad109adcabcb0c3f4f2ff56f0ffd85e2c71f7937..e956fa71d040756952868e423d497b8a329aff2b 100644 (file)
@@ -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) {
@@ -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));