summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-11-11 16:59:25 -0500
committerTom Rini <trini@ti.com>2014-11-11 16:59:25 -0500
commit6841deb6209ee420b7bcb6e320a8a06fd57658df (patch)
treefd00ae8121b49d33b1f02437cfee50ad1df0adaa /common
parent63f7af9a4cfb4a3b9136674c6612c6d13957c2cd (diff)
parent6a559bbe2f60ab64e28662f7ab52551a2eaa7163 (diff)
downloadtalos-obmc-uboot-6841deb6209ee420b7bcb6e320a8a06fd57658df.tar.gz
talos-obmc-uboot-6841deb6209ee420b7bcb6e320a8a06fd57658df.zip
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'common')
-rw-r--r--common/usb_storage.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/common/usb_storage.c b/common/usb_storage.c
index eb7706c100..1411737bed 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -1351,8 +1351,11 @@ int usb_stor_get_info(struct usb_device *dev, struct us_data *ss,
perq = usb_stor_buf[0];
modi = usb_stor_buf[1];
- if ((perq & 0x1f) == 0x1f) {
- /* skip unknown devices */
+ /*
+ * Skip unknown devices (0x1f) and enclosure service devices (0x0d),
+ * they would not respond to test_unit_ready .
+ */
+ if (((perq & 0x1f) == 0x1f) || ((perq & 0x1f) == 0x0d)) {
return 0;
}
if ((modi&0x80) == 0x80) {
OpenPOWER on IntegriCloud