From: Erik Hansen <erik@makarta.com>
Date: Thu, 24 Mar 2011 14:06:24 +0000 (+0100)
Subject: Remove unnecessary reset in usb_stor_get_info
X-Git-Tag: v2011.06-rc1~189
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=56887e27aee57db866a877e60a9141caa32d4636;p=u-boot

Remove unnecessary reset in usb_stor_get_info

The reset request in usb_stor_get_info is causing issues with some usb
sticks. Some of these sticks vendor_id/product_id have been hardcoded to
not reset but better is to remove the reset altogether. It is not needed.

Signed-off-by: Erik Hansen <erik@makarta.com>
---

diff --git a/common/usb_storage.c b/common/usb_storage.c
index 1e6cd6af27..6963e6dcc8 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -1346,31 +1346,6 @@ int usb_stor_get_info(struct usb_device *dev, struct us_data *ss,
 	unsigned long *capacity, *blksz;
 	ccb *pccb = &usb_ccb;
 
-	/* for some reasons a couple of devices would not survive this reset */
-	if (
-	    /* Sony USM256E */
-	    (dev->descriptor.idVendor == 0x054c &&
-	     dev->descriptor.idProduct == 0x019e)
-	    ||
-	    /* USB007 Mini-USB2 Flash Drive */
-	    (dev->descriptor.idVendor == 0x066f &&
-	     dev->descriptor.idProduct == 0x2010)
-	    ||
-	    /* SanDisk Corporation Cruzer Micro 20044318410546613953 */
-	    (dev->descriptor.idVendor == 0x0781 &&
-	     dev->descriptor.idProduct == 0x5151)
-	    ||
-	    /*
-	     * SanDisk Corporation U3 Cruzer Micro 1/4GB
-	     * Flash Drive 000016244373FFB4
-	     */
-	    (dev->descriptor.idVendor == 0x0781 &&
-	     dev->descriptor.idProduct == 0x5406)
-	    )
-		USB_STOR_PRINTF("usb_stor_get_info: skipping RESET..\n");
-	else
-		ss->transport_reset(ss);
-
 	pccb->pdata = usb_stor_buf;
 
 	dev_desc->target = dev->devnum;