diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 18:13:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 18:13:26 -0400 |
| commit | d3b8a1a8496c83bc4a3cc76505c29255af15572c (patch) | |
| tree | b56eb3ef27117bad5c516d6b647bdcd465d7659a /drivers/usb/gadget/zero.c | |
| parent | 60564a313a5738960064d6c555ec066d9332f278 (diff) | |
| parent | 0ed0c0c48c508578c30aa58f755ca0d692636906 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/usb/gadget/zero.c')
| -rw-r--r-- | drivers/usb/gadget/zero.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c index 6e49432071a1..a6e035e24479 100644 --- a/drivers/usb/gadget/zero.c +++ b/drivers/usb/gadget/zero.c | |||
| @@ -919,9 +919,9 @@ zero_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) | |||
| 919 | struct zero_dev *dev = get_gadget_data (gadget); | 919 | struct zero_dev *dev = get_gadget_data (gadget); |
| 920 | struct usb_request *req = dev->req; | 920 | struct usb_request *req = dev->req; |
| 921 | int value = -EOPNOTSUPP; | 921 | int value = -EOPNOTSUPP; |
| 922 | u16 w_index = ctrl->wIndex; | 922 | u16 w_index = le16_to_cpu(ctrl->wIndex); |
| 923 | u16 w_value = ctrl->wValue; | 923 | u16 w_value = le16_to_cpu(ctrl->wValue); |
| 924 | u16 w_length = ctrl->wLength; | 924 | u16 w_length = le16_to_cpu(ctrl->wLength); |
| 925 | 925 | ||
| 926 | /* usually this stores reply data in the pre-allocated ep0 buffer, | 926 | /* usually this stores reply data in the pre-allocated ep0 buffer, |
| 927 | * but config change events will reconfigure hardware. | 927 | * but config change events will reconfigure hardware. |