diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-07-14 00:48:06 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-07-14 00:48:06 +0200 |
| commit | ae1d7d4b2e87d8e43ff755108db851161d0231bb (patch) | |
| tree | a78e0fe52bbda4a604dca272dbdabec8e3a92848 | |
| parent | dbba399be025bfb23f58dc349b09446c5688c256 (diff) | |
| parent | f88a0ae6d78a0b4dacb3caef6b101b54dff5fc78 (diff) | |
| download | u-boot-imx-ae1d7d4b2e87d8e43ff755108db851161d0231bb.zip u-boot-imx-ae1d7d4b2e87d8e43ff755108db851161d0231bb.tar.gz u-boot-imx-ae1d7d4b2e87d8e43ff755108db851161d0231bb.tar.bz2 | |
Merge with /home/tur/proj/usb_sticks/u-boot
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | common/usb_storage.c | 4 |
2 files changed, 6 insertions, 0 deletions
@@ -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 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 @@ 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 |