From mboxrd@z Thu Jan  1 00:00:00 1970
From: Kim B. Heino <Kim.Heino@bluegiga.com>
Date: Fri, 12 Mar 2010 10:07:00 +0200
Subject: [U-Boot] [PATCH] USB storage probe
Message-ID: <20100312100700.1ed6bcec@bluegiga.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

While debugging one ill behaving USB device I found two bugs in USB
storage probe.

usb_stor_get_info() returns -1 (error), 0 (skip) or 1 (ok). First part
of this patch fixes error case.

Second part fixes usb_inquiry()'s retry counter handling. Original code
had retry = -1 on error case, not retry = 0 as checked in the next line.


Signed-off-by: Kim B. Heino <Kim.Heino@bluegiga.com>


diff -ur u-boot.orig/common/usb_storage.c u-boot/common/usb_storage.c
--- u-boot.orig/common/usb_storage.c	2010-03-12 01:26:32.000000000 +0200
+++ u-boot/common/usb_storage.c	2010-03-12 09:51:56.355564562 +0200
@@ -244,7 +244,7 @@
 			 * get info and fill it in
 			 */
 			if (usb_stor_get_info(dev, &usb_stor[usb_max_devs],
-						&usb_dev_desc[usb_max_devs]))
+						&usb_dev_desc[usb_max_devs]) == 1)
 				usb_max_devs++;
 		}
 		/* if storage device */
@@ -888,7 +888,7 @@
 		USB_STOR_PRINTF("inquiry returns %d\n", i);
 		if (i == 0)
 			break;
-	} while (retry--);
+	} while (--retry);
 
 	if (!retry) {
 		printf("error in inquiry\n");