summaryrefslogtreecommitdiffstats
path: root/drivers/usb/misc/usbtest.c
diff options
context:
space:
mode:
authorPeter Chen2016-07-26 10:01:30 +0200
committerGreg Kroah-Hartman2016-08-09 15:45:59 +0200
commit28324936f3d672bbf83472fece8f36a158a52276 (patch)
treefb4650bc15f517082026a76b4968f1042dbbdb04 /drivers/usb/misc/usbtest.c
parentUSB: hub: change the locking in hub_activate (diff)
downloadkernel-qcow2-linux-28324936f3d672bbf83472fece8f36a158a52276.tar.gz
kernel-qcow2-linux-28324936f3d672bbf83472fece8f36a158a52276.tar.xz
kernel-qcow2-linux-28324936f3d672bbf83472fece8f36a158a52276.zip
usb: misc: usbtest: usbtest_do_ioctl may return positive integer
For case 14 and case 21, their correct return value is the number of bytes transferred, so it is a positive integer. But in usbtest_ioctl, it takes non-zero as false return value for usbtest_do_ioctl, so it will treat the correct test as wrong test, then the time on tests will be the minus value. Signed-off-by: Peter Chen <peter.chen@nxp.com> Cc: stable <stable@vger.kernel.org> Fixes: 18fc4ebdc705 ("usb: misc: usbtest: Remove timeval usage") Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/misc/usbtest.c')
-rw-r--r--drivers/usb/misc/usbtest.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index 6b978f04b8d7..5e3464e8d4e5 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -2602,7 +2602,7 @@ usbtest_ioctl(struct usb_interface *intf, unsigned int code, void *buf)
ktime_get_ts64(&start);
retval = usbtest_do_ioctl(intf, param_32);
- if (retval)
+ if (retval < 0)
goto free_mutex;
ktime_get_ts64(&end);