diff options
| author | Troy Kisky <troy.kisky@boundarydevices.com> | 2017-04-10 18:23:11 -0700 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2017-04-14 16:44:17 +0200 |
| commit | 1e5eca7d422563df91a54e270c297b0c465f2659 (patch) | |
| tree | 0470cf120150e3040d360006526b467e63198be7 /common | |
| parent | 57ca63b86e5987029cd4970890aa28602ba50856 (diff) | |
| download | u-boot-1e5eca7d422563df91a54e270c297b0c465f2659.tar.gz u-boot-1e5eca7d422563df91a54e270c297b0c465f2659.tar.bz2 u-boot-1e5eca7d422563df91a54e270c297b0c465f2659.zip | |
usb: return 0 from usb_stor_get_info even if removable media
This fixes a regression caused by
commit 07b2b78ce4bc8ae25e066c65245eaf58c0d9a67c
dm: usb: Convert USB storage to use driver-model for block devs
which caused part_init to be called when it was not previously.
Without this patch, the following happens when a USB sd card reader is used.
=> usb start
starting USB...
USB0: Port not available.
USB1: USB EHCI 1.00
scanning bus 1 for devices... 3 USB Device(s) found
scanning usb for storage devices... Device NOT ready
Request Sense returned 02 3A 00
### ERROR ### Please RESET the board ###
This happens because dev_desc->blksz is 0.
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/usb_storage.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/common/usb_storage.c b/common/usb_storage.c index b524a15e2b..83279c449d 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -1440,10 +1440,8 @@ int usb_stor_get_info(struct usb_device *dev, struct us_data *ss, " Request Sense returned %02X %02X %02X\n", pccb->sense_buf[2], pccb->sense_buf[12], pccb->sense_buf[13]); - if (dev_desc->removable == 1) { + if (dev_desc->removable == 1) dev_desc->type = perq; - return 1; - } return 0; } pccb->pdata = (unsigned char *)cap; |