V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

dm: usb: Fix type problems in usb_stor_get_info() 

This function assumes that unsigned long is 32-bits wide, but it is not
on 64-bit machines. Use the correct type, and add a few debug() lines also.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Marek Vasut <marex@denx.de>
This commit is contained in:
Simon Glass 2015-03-25 12:22:12 -06:00
parent 2e17c87ebb
commit 1d5827a12e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/usb_storage.c
View File

@ -1191,6 +1191,7 @@ int usb_storage_probe(struct usb_device *dev, unsigned int ifnum,
iface->desc.bInterfaceClass != USB_CLASS_MASS_STORAGE || iface->desc.bInterfaceClass != USB_CLASS_MASS_STORAGE ||
iface->desc.bInterfaceSubClass < US_SC_MIN || iface->desc.bInterfaceSubClass < US_SC_MIN ||
iface->desc.bInterfaceSubClass > US_SC_MAX) { iface->desc.bInterfaceSubClass > US_SC_MAX) {
debug("Not mass storage\n");
/* if it's not a mass storage, we go no further */ /* if it's not a mass storage, we go no further */
return 0; return 0;
} }
@ -1317,8 +1318,10 @@ int usb_stor_get_info(struct usb_device *dev, struct us_data *ss,
pccb->lun = dev_desc->lun; pccb->lun = dev_desc->lun;
debug(" address %d\n", dev_desc->target); debug(" address %d\n", dev_desc->target);
if (usb_inquiry(pccb, ss)) if (usb_inquiry(pccb, ss)) {
debug("%s: usb_inquiry() failed\n", __func__);
return -1; return -1;
}
perq = usb_stor_buf[0]; perq = usb_stor_buf[0];
modi = usb_stor_buf[1]; modi = usb_stor_buf[1];
@ -1328,6 +1331,7 @@ int usb_stor_get_info(struct usb_device *dev, struct us_data *ss,
* they would not respond to test_unit_ready . * they would not respond to test_unit_ready .
*/ */
if (((perq & 0x1f) == 0x1f) || ((perq & 0x1f) == 0x0d)) { if (((perq & 0x1f) == 0x1f) || ((perq & 0x1f) == 0x0d)) {
debug("%s: unknown/unsupported device\n", __func__);
return 0; return 0;
} }
if ((modi&0x80) == 0x80) { if ((modi&0x80) == 0x80) {