public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] usb: Early failure when the first descriptor read fails, one way or another
@ 2015-03-28 17:23 Paul Kocialkowski
  2015-03-28 17:26 ` Marek Vasut
  0 siblings, 1 reply; 7+ messages in thread
From: Paul Kocialkowski @ 2015-03-28 17:23 UTC (permalink / raw)
  To: u-boot

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>
---
 common/usb.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/usb.c b/common/usb.c
index 32e15cd..d1b3316 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -950,7 +950,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 1;
 	}
@@ -990,6 +990,9 @@ int usb_new_device(struct usb_device *dev)
 	case 64:
 		dev->maxpacketsize = PACKET_SIZE_64;
 		break;
+	default:
+		debug("usb_new_device: invalid max packet size\n");
+		return 1;
 	}
 	dev->devnum = addr;
 
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2015-04-03  2:01 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-28 17:23 [U-Boot] [PATCH] usb: Early failure when the first descriptor read fails, one way or another Paul Kocialkowski
2015-03-28 17:26 ` Marek Vasut
2015-03-28 17:31   ` Paul Kocialkowski
2015-03-29 10:30     ` Paul Kocialkowski
2015-03-29 23:47     ` Marek Vasut
2015-03-30 13:35       ` Paul Kocialkowski
2015-04-03  2:01         ` Marek Vasut

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox