summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrafulla Wadaskar <prafulla@marvell.com>2009-07-17 14:26:30 (GMT)
committerRemy Bohmer <linux@bohmer.net>2009-07-23 21:27:06 (GMT)
commit44259bb9e696d22bf1773181111855a29f00cf33 (patch)
tree6682a86428739132a68ea5feb602150fee9be8e8
parent28958b8bea4c66629c5a22fd3c8b0d49df90383d (diff)
downloadu-boot-fsl-qoriq-44259bb9e696d22bf1773181111855a29f00cf33.tar.xz
usb: bugfix driver/usb/host/ehci-hcd.c function ehci_submit_root
This change is cheked in Linux source and fix found to be in sync. This patch is tested for USB host interface on Kirkwood based Sheevaplug platform (ARM little endian board) Risk: the impact of this patch is not validated on big endian board. This need to be checked... Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com> Signed-off-by: Remy Bohmer <linux@bohmer.net>
-rw-r--r--drivers/usb/host/ehci-hcd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 423ea5d..324c308 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -550,9 +550,9 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,
req->requesttype, req->requesttype,
le16_to_cpu(req->value), le16_to_cpu(req->index));
- typeReq = req->request << 8 | req->requesttype;
+ typeReq = req->request | req->requesttype << 8;
- switch (le16_to_cpu(typeReq)) {
+ switch (typeReq) {
case DeviceRequest | USB_REQ_GET_DESCRIPTOR:
switch (le16_to_cpu(req->value) >> 8) {
case USB_DT_DEVICE: