diff options
author | Wolfgang Denk <wd@pollux.denx.de> | 2006-08-07 23:21:52 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-08-07 23:21:52 +0200 |
commit | 98280e3d431db77d92219438b8840853bd7cb412 (patch) | |
tree | f771fe8d5086d32cda26a0b8d16f9b95e761838e /common/usb_storage.c | |
parent | 99d70e3a47affb9bae041a2caece7cd516e213b3 (diff) | |
parent | 6587f7e1e98bfcb7910a47bae2eb51e9a5fbd4da (diff) | |
download | u-boot-imx-98280e3d431db77d92219438b8840853bd7cb412.zip u-boot-imx-98280e3d431db77d92219438b8840853bd7cb412.tar.gz u-boot-imx-98280e3d431db77d92219438b8840853bd7cb412.tar.bz2 |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'common/usb_storage.c')
-rw-r--r-- | common/usb_storage.c | 4 |
1 files changed, 4 insertions, 0 deletions
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 |