Skip to contentSkip to conversation

USB storage probe

PATCH New Kim B. Heino 2 participants 2 messages Mar 12, 2010 – Mar 24, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 USB storage probe

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.

common/usb_storage.c +2 -2
diff -ur u-boot.orig/common/usb_storage.c u-boot/common/usb_storage.c
@@ -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");
#1 lore raw

PATCH 1/1 USB storage probe

Hi,

2010/3/12 Kim B. Heino <[email protected]>:

Quoted 11 lines

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.

Applied to U-boot-usb
Thanks.

Remy