Thread (34 messages) 34 messages, 4 authors, 2021-08-22

Re: [PATCH 10/10] staging: r8188eu: set pipe only once

From: Phillip Potter <phil@philpotter.co.uk>
Date: 2021-08-21 17:47:42
Also in: lkml

On Sat, 21 Aug 2021 at 17:50, Martin Kaiser [off-list ref] wrote:
quoted hunk ↗ jump to hunk
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.

Signed-off-by: Martin Kaiser <redacted>
---
 drivers/staging/r8188eu/hal/usb_ops_linux.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c
index 5408383ccec3..5a55ee38d7b8 100644
--- a/drivers/staging/r8188eu/hal/usb_ops_linux.c
+++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c
@@ -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,
--
2.20.1
Acked-by: Phillip Potter <phil@philpotter.co.uk>

Regards,
Phil
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help