Merge with /home/tur/proj/usb_sticks/u-boot

19 years ago · ae1d7d4b2e
parent dbba399be0 f88a0ae6d7
commit ae1d7d4b2e
2 changed files with 6 additions and 0 deletions
--- a/2
+++ b/2
@ -2,6 +2,8 @@
 Changes since U-Boot 1.1.4:
 ======================================================================

+* Fix problems with SanDisk Corporation Cruzer Micro USB memory stick.
+
 * Add support for TQM885D board.
  Patch by Martin Krause, 20 Mar 2006

--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@ -1139,6 +1139,10 @@ int usb_stor_get_info(struct usb_device *dev,struct us_data *ss,block_dev_desc_t
 	    /* 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)
 	    )
 		USB_STOR_PRINTF("usb_stor_get_info: skipping RESET..\n");
 	else