summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2017-09-18 06:40:43 -0700
committerMarek Vasut <marex@denx.de>2017-10-01 16:32:53 +0200
commit932bb668bb2464115f2d08abbed44e58cfce9536 (patch)
tree7d8b2b0891350bc108cecfdd8f4369312100ed63 /common
parentc008faa77358bb5b313696dd1d5bb8afa03a6ca2 (diff)
usb: Read device descriptor after device is addressed for xHCI
For xHCI it is not possible to read a device descriptor before it has been assigned an address. That's why usb_setup_descriptor() was called with 'do_read' being false. But we really need try to read the device descriptor before starting any real communication with the default control endpoint. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'common')
-rw-r--r--common/usb.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/common/usb.c b/common/usb.c
index 88cee810fa..8d27bc7060 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -1052,6 +1052,17 @@ static int usb_prepare_device(struct usb_device *dev, int addr, bool do_read,
mdelay(10); /* Let the SET_ADDRESS settle */
+ /*
+ * If we haven't read device descriptor before, read it here
+ * after device is assigned an address. This is only applicable
+ * to xHCI so far.
+ */
+ if (!do_read) {
+ err = usb_setup_descriptor(dev, true);
+ if (err)
+ return err;
+ }
+
return 0;
}