diff options
| author | Xinyu Chen <b03824@freescale.com> | 2011-11-03 10:59:25 +0800 |
|---|---|---|
| committer | Xinyu Chen <b03824@freescale.com> | 2011-11-03 11:14:50 +0800 |
| commit | d14614e96caffb7074401d3b5dc12ee883ba989b (patch) | |
| tree | 7b894d55710896092cb30a8b77de789c6c9a1003 | |
| parent | 687b03c77c72132b6bef72d55bbfec11b75a890e (diff) | |
ENGR00161306 usb accessory: can not set the correct device vendor info
the wIndex of the usb control request should not be override to
functions index, but keep as the one set by HOST.
The original issue of commit: c2eb4b4ca8c90a9b08417c92645555e8c0f87e50,
should be we have not enabled usb connect switch interface
for UsbDeviceManager in framework.
This reverts commit c2eb4b4ca8c90a9b08417c92645555e8c0f87e50.
Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
| -rw-r--r-- | drivers/usb/gadget/android.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c index 630368ee1763..bd1dda54c070 100644 --- a/drivers/usb/gadget/android.c +++ b/drivers/usb/gadget/android.c @@ -145,13 +145,11 @@ static int android_setup_config(struct usb_configuration *c, { int i; int ret = -EOPNOTSUPP; - struct usb_ctrlrequest tmp_ctrl = *ctrl; for (i = 0; i < c->next_interface_id; i++) if (c->interface[i]->setup) { - tmp_ctrl.wIndex = cpu_to_le16(i); ret = c->interface[i]->setup( - c->interface[i], &tmp_ctrl); + c->interface[i], ctrl); if (ret >= 0) return ret; } |