commit ae1d7d4b2e87d8e43ff755108db851161d0231bb
author Wolfgang Denk <wd@pollux.denx.de> Fri Jul 14 00:48:06 2006 +0200
committer Wolfgang Denk <wd@pollux.denx.de> Fri Jul 14 00:48:06 2006 +0200
tree a78e0fe52bbda4a604dca272dbdabec8e3a92848
parent dbba399be025bfb23f58dc349b09446c5688c256
parent f88a0ae6d78a0b4dacb3caef6b101b54dff5fc78

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

CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 7d7784b..614ec56 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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
 

common/usb_storage.c

diff --git a/common/usb_storage.c b/common/usb_storage.c
index 99e4ab0..e64470c 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -1139,6 +1139,10 @@
 	    /* 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