diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:27:12 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:27:12 -0400 |
commit | d14b50cc60ca465290fcdb3b88e7d5fb684361ed (patch) | |
tree | c4a712123b94cd4c0ab4d8d9d87a7619e9bcb6ba /drivers/usb/misc/usbtest.c | |
parent | a34b6fc04d58ad72fe0cc74cd448f4551bd2ebaf (diff) | |
parent | ef7d1b244fa6c94fb76d5f787b8629df64ea4046 (diff) | |
download | talos-obmc-linux-d14b50cc60ca465290fcdb3b88e7d5fb684361ed.tar.gz talos-obmc-linux-d14b50cc60ca465290fcdb3b88e7d5fb684361ed.zip |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/usb/misc/usbtest.c')
-rw-r--r-- | drivers/usb/misc/usbtest.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c index 786e1dbe88ec..983e104dd452 100644 --- a/drivers/usb/misc/usbtest.c +++ b/drivers/usb/misc/usbtest.c @@ -1242,11 +1242,12 @@ done: static int ctrl_out (struct usbtest_dev *dev, unsigned count, unsigned length, unsigned vary) { - unsigned i, j, len, retval; + unsigned i, j, len; + int retval; u8 *buf; char *what = "?"; struct usb_device *udev; - + if (length < 1 || length > 0xffff || vary >= length) return -EINVAL; |