From 04ee6ee2ca5ad419ebcbc64dae6e7128f32156fd Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Sat, 4 Apr 2015 15:12:29 +0200 Subject: usb: Early failure when the first descriptor read fails or is invalid This may happen when using an USB1 device on a controller that only supports USB2 (e.g. EHCI). Reading the first descriptor will fail (read 0 byte), so we can abort the process at this point instead of failing later and wasting time. Signed-off-by: Paul Kocialkowski --- common/usb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/usb.c b/common/usb.c index 6ed3124..f648847 100644 --- a/common/usb.c +++ b/common/usb.c @@ -956,7 +956,7 @@ int usb_new_device(struct usb_device *dev) */ #ifndef CONFIG_USB_XHCI err = usb_get_descriptor(dev, USB_DT_DEVICE, 0, desc, 64); - if (err < 0) { + if (err < sizeof(struct usb_device_descriptor)) { debug("usb_new_device: usb_get_descriptor() failed\n"); return -EIO; } @@ -996,6 +996,9 @@ int usb_new_device(struct usb_device *dev) case 64: dev->maxpacketsize = PACKET_SIZE_64; break; + default: + printf("usb_new_device: invalid max packet size\n"); + return -EIO; } dev->devnum = addr; -- cgit v1.1