From: Martin Kaiser <martin@kaiser.cx>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-staging@lists.linux.dev, kernel-janitors@vger.kernel.org,
linux-kernel@vger.kernel.org, Martin Kaiser <martin@kaiser.cx>
Subject: [PATCH 05/10] staging: rtl8188eu: set pipe only once
Date: Wed, 7 Apr 2021 19:05:26 +0200 [thread overview]
Message-ID: <20210407170531.29356-5-martin@kaiser.cx> (raw)
In-Reply-To: <20210407170531.29356-1-martin@kaiser.cx>
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>
---
.../staging/rtl8188eu/os_dep/usb_ops_linux.c | 22 ++++++++++---------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
index 13d2733b2b1b..f2fa4fb3595f 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
@@ -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,
--
2.20.1
next prev parent reply other threads:[~2021-04-07 17:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-07 17:05 [PATCH 01/10] staging: rtl8188eu: remove unused macros Martin Kaiser
2021-04-07 17:05 ` [PATCH 02/10] staging: rtl8188eu: remove unnecessary brackets Martin Kaiser
2021-04-07 17:05 ` [PATCH 03/10] staging: rtl8188eu: remove unused defines Martin Kaiser
2021-04-07 17:05 ` [PATCH 04/10] staging: rtl8188eu: move defines into the .c file Martin Kaiser
2021-04-07 17:05 ` Martin Kaiser [this message]
2021-04-07 17:05 ` [PATCH 06/10] staging: rtl8188eu: clean up rtw_recv_entry Martin Kaiser
2021-04-07 17:05 ` [PATCH 07/10] staging: rtl8188eu: remove unnecessary variable Martin Kaiser
2021-04-07 17:05 ` [PATCH 08/10] staging: rtl8188eu: rtw_usb_if1_init needs no dvobj parameter Martin Kaiser
2021-04-07 17:05 ` [PATCH 09/10] staging: rtl8188eu: make usb_dvobj_init return a status Martin Kaiser
2021-04-07 17:05 ` [PATCH 10/10] staging: rtl8188eu: make rtw_usb_if1_init " Martin Kaiser
2021-04-08 7:26 ` [PATCH 01/10] staging: rtl8188eu: remove unused macros Greg Kroah-Hartman
2021-04-08 19:52 ` Martin Kaiser
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210407170531.29356-5-martin@kaiser.cx \
--to=martin@kaiser.cx \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®