From: Martin Kaiser <martin@kaiser.cx>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Larry Finger <Larry.Finger@lwfinger.net>,
Phillip Potter <phil@philpotter.co.uk>,
Dan Carpenter <dan.carpenter@oracle.com>,
Michael Straube <straube.linux@gmail.com>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Martin Kaiser <martin@kaiser.cx>
Subject: [PATCH 08/10] staging: r8188eu: clean up the usb_writeN
Date: Sat, 21 Aug 2021 18:48:57 +0200 [thread overview]
Message-ID: <20210821164859.4351-8-martin@kaiser.cx> (raw)
In-Reply-To: <20210821164859.4351-1-martin@kaiser.cx>
Remove unnecessary variables, check the length.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/hal/usb_ops_linux.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c
index e01f1ac19596..5408383ccec3 100644
--- a/drivers/staging/r8188eu/hal/usb_ops_linux.c
+++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c
@@ -151,20 +151,15 @@ static int usb_write32(struct intf_hdl *pintfhdl, u32 addr, u32 val)
static int usb_writeN(struct intf_hdl *pintfhdl, u32 addr, u32 length, u8 *pdata)
{
- u16 wvalue;
- u16 len;
+ u16 wvalue = (u16)(addr & 0x0000ffff);
u8 buf[VENDOR_CMD_MAX_DATA_LEN] = {0};
- int ret;
-
+ if (length > VENDOR_CMD_MAX_DATA_LEN)
+ return -EINVAL;
- wvalue = (u16)(addr & 0x0000ffff);
- len = length;
- memcpy(buf, pdata, len);
+ memcpy(buf, pdata, length);
- ret = usbctrl_vendorreq(pintfhdl, wvalue, buf, len, REALTEK_USB_VENQT_WRITE);
-
- return ret;
+ return usbctrl_vendorreq(pintfhdl, wvalue, buf, (length & 0xffff), REALTEK_USB_VENQT_WRITE);
}
static void interrupt_handler_8188eu(struct adapter *adapt, u16 pkt_len, u8 *pbuf)
--
2.20.1
next prev parent reply other threads:[~2021-08-21 16:50 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-21 16:48 [PATCH 01/10] staging: r8188eu: remove unnecessary cast Martin Kaiser
2021-08-21 16:48 ` [PATCH 02/10] staging: r8188eu: remove unused define Martin Kaiser
2021-08-21 17:27 ` Phillip Potter
2021-08-22 11:56 ` Michael Straube
2021-08-21 16:48 ` [PATCH 03/10] staging: rtl8188eu: use actual request type as parameter Martin Kaiser
2021-08-21 17:44 ` Phillip Potter
2021-08-22 12:08 ` Michael Straube
2021-08-21 16:48 ` [PATCH 04/10] staging: r8188eu: rewrite usb vendor request defines Martin Kaiser
2021-08-21 17:45 ` Phillip Potter
2021-08-22 12:18 ` Michael Straube
2021-08-21 16:48 ` [PATCH 05/10] staging: r8188eu: remove an unused enum Martin Kaiser
2021-08-21 17:29 ` Phillip Potter
2021-08-22 12:19 ` Michael Straube
2021-08-21 16:48 ` [PATCH 06/10] staging: r8188eu: clean up the usb_readXY functions Martin Kaiser
2021-08-21 17:45 ` Phillip Potter
2021-08-22 12:25 ` Michael Straube
2021-08-21 16:48 ` [PATCH 07/10] staging: r8188eu: clean up the usb_writeXY functions Martin Kaiser
2021-08-21 17:46 ` Phillip Potter
2021-08-22 12:27 ` Michael Straube
2021-08-21 16:48 ` Martin Kaiser [this message]
2021-08-21 17:47 ` [PATCH 08/10] staging: r8188eu: clean up the usb_writeN Phillip Potter
2021-08-22 13:24 ` Michael Straube
2021-08-22 16:58 ` Martin Kaiser
2021-08-22 17:17 ` Michael Straube
2021-08-21 16:48 ` [PATCH 09/10] staging: r8188eu: remove unused members of struct _io_ops Martin Kaiser
2021-08-21 17:29 ` Phillip Potter
2021-08-22 13:28 ` Michael Straube
2021-08-21 16:48 ` [PATCH 10/10] staging: r8188eu: set pipe only once Martin Kaiser
2021-08-21 17:47 ` Phillip Potter
2021-08-22 14:05 ` Michael Straube
2021-08-21 17:27 ` [PATCH 01/10] staging: r8188eu: remove unnecessary cast Phillip Potter
2021-08-22 17:04 ` Martin Kaiser
2021-08-22 23:49 ` Phillip Potter
2021-08-22 11:54 ` Michael Straube
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=20210821164859.4351-8-martin@kaiser.cx \
--to=martin@kaiser.cx \
--cc=Larry.Finger@lwfinger.net \
--cc=dan.carpenter@oracle.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=phil@philpotter.co.uk \
--cc=straube.linux@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).