staging: r8188eu: set pipe only once
authorMartin Kaiser <martin@kaiser.cx>
Sat, 21 Aug 2021 16:48:59 +0000 (18:48 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 26 Aug 2021 10:17:01 +0000 (12:17 +0200)
Set the pipe for reading or writing in usbctrl_vendorreq only once.
There's no need to set it again for every retry.

This patch is an adaptation of commit 889ed8b5e374 ("staging: rtl8188eu:
set pipe only once") for the new r8188eu driver.

Acked-by: Phillip Potter <phil@philpotter.co.uk>
Acked-by: Michael Straube <straube.linux@gmail.com>
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20210821164859.4351-10-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/hal/usb_ops_linux.c

index 5408383ccec3c6a2687e1223048716362be845af..5a55ee38d7b80d8a5c6ada712fcb9c1c06919790 100644 (file)
@@ -40,15 +40,16 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u16 value, void *pdata,
                goto release_mutex;
        }
 
-       while (++vendorreq_times <= MAX_USBCTRL_VENDORREQ_TIMES) {
-               memset(pIo_buf, 0, len);
+       if (requesttype == REALTEK_USB_VENQT_READ)
+               pipe = usb_rcvctrlpipe(udev, 0);/* read_in */
+       else
+               pipe = usb_sndctrlpipe(udev, 0);/* write_out */
 
-               if (requesttype == REALTEK_USB_VENQT_READ) {
-                       pipe = usb_rcvctrlpipe(udev, 0);/* read_in */
-               } else {
-                       pipe = usb_sndctrlpipe(udev, 0);/* write_out */
+       while (++vendorreq_times <= MAX_USBCTRL_VENDORREQ_TIMES) {
+               if (requesttype == REALTEK_USB_VENQT_READ)
+                       memset(pIo_buf, 0, len);
+               else
                        memcpy(pIo_buf, pdata, len);
-               }
 
                status = usb_control_msg(udev, pipe, REALTEK_USB_VENQT_CMD_REQ,
                                         requesttype, value, REALTEK_USB_VENQT_CMD_IDX,