LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <contact@paulk.fr>
This commit is contained in:
Paul Kocialkowski 2015-04-04 15:12:29 +02:00 committed by Marek Vasut
parent 8879be8857
commit 04ee6ee2ca
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/usb.c
View File

@ -956,7 +956,7 @@ int usb_new_device(struct usb_device *dev)
*/ */
#ifndef CONFIG_USB_XHCI #ifndef CONFIG_USB_XHCI
err = usb_get_descriptor(dev, USB_DT_DEVICE, 0, desc, 64); 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"); debug("usb_new_device: usb_get_descriptor() failed\n");
return -EIO; return -EIO;
} }
@ -996,6 +996,9 @@ int usb_new_device(struct usb_device *dev)
case 64: case 64:
dev->maxpacketsize = PACKET_SIZE_64; dev->maxpacketsize = PACKET_SIZE_64;
break; break;
default:
printf("usb_new_device: invalid max packet size\n");
return -EIO;
} }
dev->devnum = addr; dev->devnum = addr;