admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

usb: usbtmc: Remove unnecessary local variable from usbtmc_ioctl_request

Browse Source 
The local variable 'res' is only used to temporary store the results of
calling copy_from_user() and copy_to_user(). Use the results directly
and remove the local variable.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Link: https://lore.kernel.org/r/20250918151328.331015-1-thorsten.blum@linux.dev
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Thorsten Blum
2025-09-18 17:13:22 +02:00
committed by Greg Kroah-Hartman
parent b61cb4419e
commit 6e26324df8
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/usb/class/usbtmc.c
View File

@@ -1936,10 +1936,8 @@ static int usbtmc_ioctl_request(struct usbtmc_device_data *data,
u8 *buffer = NULL; u8 *buffer = NULL;
int rv; int rv;
unsigned int is_in, pipe; unsigned int is_in, pipe;
unsigned long res;
res = copy_from_user(&request, arg, sizeof(struct usbtmc_ctrlrequest)); if (copy_from_user(&request, arg, sizeof(struct usbtmc_ctrlrequest)))
if (res)
return -EFAULT; return -EFAULT;
if (request.req.wLength > USBTMC_BUFSIZE) if (request.req.wLength > USBTMC_BUFSIZE)
@@ -1956,9 +1954,8 @@ static int usbtmc_ioctl_request(struct usbtmc_device_data *data,
if (!is_in) { if (!is_in) {
/* Send control data to device */ /* Send control data to device */
res = copy_from_user(buffer, request.data, if (copy_from_user(buffer, request.data,
request.req.wLength); request.req.wLength)) {
if (res) {
rv = -EFAULT; rv = -EFAULT;
goto exit; goto exit;
} }
@@ -1984,8 +1981,7 @@ static int usbtmc_ioctl_request(struct usbtmc_device_data *data,
if (rv && is_in) { if (rv && is_in) {
/* Read control data from device */ /* Read control data from device */
res = copy_to_user(request.data, buffer, rv); if (copy_to_user(request.data, buffer, rv))
if (res)
rv = -EFAULT; rv = -EFAULT;
} }