diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:27:27 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:27:27 -0400 |
commit | 499792ec6dc737467e5486527cef95ed7d74fba9 (patch) | |
tree | b88c4ef9d4491c17f71d26d33e73f05f7c7ea6a0 /drivers/usb/misc/usbtest.c | |
parent | 421b20b9c44b3fcdc07d6af875dad5ae86fad014 (diff) | |
parent | d14b50cc60ca465290fcdb3b88e7d5fb684361ed (diff) | |
download | talos-obmc-linux-499792ec6dc737467e5486527cef95ed7d74fba9.tar.gz talos-obmc-linux-499792ec6dc737467e5486527cef95ed7d74fba9.zip |
Merge branch 'upstream-fixes' into upstream
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; |