From 2729af9d544bfba5de47698c2852652d95723943 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Mon, 3 May 2004 20:45:30 +0000
Subject: * 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.
---
 common/usb_storage.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'common/usb_storage.c')

diff --git a/common/usb_storage.c b/common/usb_storage.c
index fd116be86a..605a1ceb9b 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;
-- 
cgit v1.2.1