summaryrefslogtreecommitdiff
path: root/common/usb_storage.c
diff options
context:
space:
mode:
authorKim B. Heino <Kim.Heino@bluegiga.com>2010-03-12 15:46:56 +0200
committerRemy Bohmer <linux@bohmer.net>2010-04-08 21:40:00 +0200
commitaaad108b889c6980a2d05262a2f7febb14f94d68 (patch)
tree616df580afc3a5e279c63f35266bc98ec13c7887 /common/usb_storage.c
parentd7a22a364ceea97133c1fb7aff073953c7a61228 (diff)
USB storage count
Here's another USB storage patch. Currently U-Boot handles storage devices #0 - #4 as valid devices, even if there is none connected. This patch fixes usb_stor_get_dev() to check detected device count instead of MAX-define. This is very important for ill behaving devices. usb_dev_desc[] can be partially initialized if device probe fails. After fixing get_dev() it was easy to fix "usb part" etc commands. Previously it outputed "Unknown partition table" five times, now it's "no USB devices available". Signed-off-by: Kim B. Heino <Kim.Heino@bluegiga.com>
Diffstat (limited to 'common/usb_storage.c')
-rw-r--r--common/usb_storage.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/usb_storage.c b/common/usb_storage.c
index a8642c9cc5..239bddc511 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -175,7 +175,7 @@ void uhci_show_temp_int_td(void);
block_dev_desc_t *usb_stor_get_dev(int index)
{
- return (index < USB_MAX_STOR_DEV) ? &usb_dev_desc[index] : NULL;
+ return (index < usb_max_devs) ? &usb_dev_desc[index] : NULL;
}