summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-05-03 20:45:30 +0000
committerwdenk <wdenk>2004-05-03 20:45:30 +0000
commit2729af9d544bfba5de47698c2852652d95723943 (patch)
tree5ce61a31488dc73b827f0a7b519d7ae03c8829bd /common
parent08f1080c9cbde2a500e6efe8bc5647a68f183c91 (diff)
downloadu-boot-imx-2729af9d544bfba5de47698c2852652d95723943.zip
u-boot-imx-2729af9d544bfba5de47698c2852652d95723943.tar.gz
u-boot-imx-2729af9d544bfba5de47698c2852652d95723943.tar.bz2
* Fix minor NAND JFFS2 related issue
* Fixes for SL811 USB controller: - implement workaround for broken memory stick - improve error handling * Increase packet send timeout to 10 ms in cpu/mpc8xx/scc.c to better cope with congested networks.
Diffstat (limited to 'common')
-rw-r--r--common/usb_storage.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/common/usb_storage.c b/common/usb_storage.c
index fd116be..605a1ce 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -1105,7 +1105,10 @@ int usb_stor_get_info(struct usb_device *dev,struct us_data *ss,block_dev_desc_t
unsigned long *capacity,*blksz;
ccb *pccb=&usb_ccb;
- ss->transport_reset(ss);
+ /* For some mysterious reason the 256MB flash disk of Ours Technology, Inc
+ * doesn't survive this reset */
+ if (dev->descriptor.idVendor != 0xea0 || dev->descriptor.idProduct != 0x6828)
+ ss->transport_reset(ss);
pccb->pdata=usb_stor_buf;
dev_desc->target=dev->devnum;