projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-mmc
[platform/kernel/u-boot.git]
/
common
/
usb_storage.c
diff --git
a/common/usb_storage.c
b/common/usb_storage.c
index
b524a15
..
03171f7
100644
(file)
--- a/
common/usb_storage.c
+++ b/
common/usb_storage.c
@@
-100,7
+100,7
@@
struct us_data {
trans_cmnd transport; /* transport routine */
};
trans_cmnd transport; /* transport routine */
};
-#ifdef CONFIG_USB_EHCI
+#ifdef CONFIG_USB_EHCI
_HCD
/*
* The U-Boot EHCI driver can handle any transfer length as long as there is
* enough free heap space left, but the SCSI READ(10) and WRITE(10) commands are
/*
* The U-Boot EHCI driver can handle any transfer length as long as there is
* enough free heap space left, but the SCSI READ(10) and WRITE(10) commands are
@@
-1440,10
+1440,8
@@
int usb_stor_get_info(struct usb_device *dev, struct us_data *ss,
" Request Sense returned %02X %02X %02X\n",
pccb->sense_buf[2], pccb->sense_buf[12],
pccb->sense_buf[13]);
" Request Sense returned %02X %02X %02X\n",
pccb->sense_buf[2], pccb->sense_buf[12],
pccb->sense_buf[13]);
- if (dev_desc->removable == 1)
{
+ if (dev_desc->removable == 1)
dev_desc->type = perq;
dev_desc->type = perq;
- return 1;
- }
return 0;
}
pccb->pdata = (unsigned char *)cap;
return 0;
}
pccb->pdata = (unsigned char *)cap;