From: Franck Jullien franck.jullien@gmail.com

Mass storage is not necessary present on interface 0. This patch allow usb_stor_scan to look in every available interface.

Signed-off-by: Franck Jullien franck.jullien@gmail.com --- common/usb_storage.c | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/common/usb_storage.c b/common/usb_storage.c index 1411737..a9160fd 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -215,7 +215,7 @@ static unsigned int usb_get_max_lun(struct us_data *us) */ int usb_stor_scan(int mode) { - unsigned char i; + unsigned char i, iface; struct usb_device *dev;

if (mode == 1) @@ -241,20 +241,22 @@ int usb_stor_scan(int mode) if (dev == NULL) break; /* no more devices available */

- if (usb_storage_probe(dev, 0, &usb_stor[usb_max_devs])) { - /* OK, it's a storage device. Iterate over its LUNs - * and populate `usb_dev_desc'. - */ - int lun, max_lun, start = usb_max_devs; - - max_lun = usb_get_max_lun(&usb_stor[usb_max_devs]); - for (lun = 0; - lun <= max_lun && usb_max_devs < USB_MAX_STOR_DEV; - lun++) { - usb_dev_desc[usb_max_devs].lun = lun; - if (usb_stor_get_info(dev, &usb_stor[start], - &usb_dev_desc[usb_max_devs]) == 1) { - usb_max_devs++; + for (iface = 0; iface < dev->config.no_of_if; iface++) { + if (usb_storage_probe(dev, 0, &usb_stor[usb_max_devs])) { + /* OK, it's a storage device. Iterate over its LUNs + * and populate `usb_dev_desc'. + */ + int lun, max_lun, start = usb_max_devs; + + max_lun = usb_get_max_lun(&usb_stor[usb_max_devs]); + for (lun = 0; + lun <= max_lun && usb_max_devs < USB_MAX_STOR_DEV; + lun++) { + usb_dev_desc[usb_max_devs].lun = lun; + if (usb_stor_get_info(dev, &usb_stor[start], + &usb_dev_desc[usb_max_devs]) == 1) { + usb_max_devs++; + } } } }