diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-26 22:44:27 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-26 22:44:27 +0200 |
| commit | 2050826982f329a87c3a504add701aa2233e9067 (patch) | |
| tree | 7121024bcd8d42d17b2dac104f2ffcd1fc0d8ab9 | |
| parent | f33b325af666b12eafa9ab235b2cd59832d6e51c (diff) | |
| parent | 44259bb9e696d22bf1773181111855a29f00cf33 (diff) | |
| download | u-boot-imx-2050826982f329a87c3a504add701aa2233e9067.zip u-boot-imx-2050826982f329a87c3a504add701aa2233e9067.tar.gz u-boot-imx-2050826982f329a87c3a504add701aa2233e9067.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
| -rw-r--r-- | drivers/usb/host/ehci-hcd.c | 4 |
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: |