]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
staging: rtl8188eu: set pipe only once
authorMartin Kaiser <martin@kaiser.cx>
Wed, 7 Apr 2021 17:05:26 +0000 (19:05 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 8 Apr 2021 07:26:32 +0000 (09:26 +0200)
Set the pipe for reading or writing in usbctrl_vendorreq only once. There's
no need to set it again for every retry.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20210407170531.29356-5-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c

index 13d2733b2b1bb8f3cad94a0b0fdd08792d64b1d5..f2fa4fb3595f010a7984164b5f48f05c325cd659 100644 (file)
@@ -249,18 +249,20 @@ usbctrl_vendorreq(struct adapter *adapt, u16 value, void *pdata, u16 len, u8 req
                goto release_mutex;
        }
 
-       while (++vendorreq_times <= MAX_USBCTRL_VENDORREQ_TIMES) {
-               memset(pIo_buf, 0, len);
+       if (reqtype == REALTEK_USB_VENQT_READ) {
+               pipe = usb_rcvctrlpipe(udev, 0);
+       } else if (reqtype == REALTEK_USB_VENQT_WRITE) {
+               pipe = usb_sndctrlpipe(udev, 0);
+       } else {
+               status = -EINVAL;
+               goto free_buf;
+       }
 
-               if (reqtype == REALTEK_USB_VENQT_READ) {
-                       pipe = usb_rcvctrlpipe(udev, 0);/* read_in */
-               } else if (reqtype == REALTEK_USB_VENQT_WRITE) {
-                       pipe = usb_sndctrlpipe(udev, 0);/* write_out */
+       while (++vendorreq_times <= MAX_USBCTRL_VENDORREQ_TIMES) {
+               if (reqtype == REALTEK_USB_VENQT_READ)
+                       memset(pIo_buf, 0, len);
+               else
                        memcpy(pIo_buf, pdata, len);
-               } else {
-                       status = -EINVAL;
-                       goto free_buf;
-               }
 
                status = usb_control_msg(udev, pipe, REALTEK_USB_VENQT_CMD_REQ,
                                         reqtype, value, REALTEK_USB_VENQT_CMD_IDX,