Browse Source

Merge branch 'master' of git://git.denx.de/u-boot-usb

Wolfgang Denk 16 years ago
parent
commit
2050826982
1 changed files with 2 additions and 2 deletions
  1. 2 2
      drivers/usb/host/ehci-hcd.c

+ 2 - 2
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: