diff options
| author | Jassi Brar <jaswinder.singh@linaro.org> | 2011-12-02 13:58:37 +0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2012-02-14 14:27:32 -0800 |
| commit | a4341dbc0d351c194b4997d572dd3559d18e9f85 (patch) | |
| tree | b1dfdac5dfe254c11ca98d7b881e3f55583ec290 /drivers/usb | |
| parent | ed3b6d85fc3b9c40f07a02068ca68eb70d9496f8 (diff) | |
usb: gadget: uplevel android code to current api
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/android.c | 1 | ||||
| -rw-r--r-- | drivers/usb/gadget/f_adb.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c index 7b243311b11b..1bc9f4d3c84c 100644 --- a/drivers/usb/gadget/android.c +++ b/drivers/usb/gadget/android.c @@ -1041,6 +1041,7 @@ static struct usb_composite_driver android_usb_driver = { .name = "android_usb", .dev = &device_desc, .strings = dev_strings, + .max_speed = USB_SPEED_HIGH, .unbind = android_usb_unbind, }; diff --git a/drivers/usb/gadget/f_adb.c b/drivers/usb/gadget/f_adb.c index ae881cb93456..63d530a798bf 100644 --- a/drivers/usb/gadget/f_adb.c +++ b/drivers/usb/gadget/f_adb.c @@ -508,9 +508,11 @@ static int adb_function_set_alt(struct usb_function *f, int ret; DBG(cdev, "adb_function_set_alt intf: %d alt: %d\n", intf, alt); + config_ep_by_speed(cdev->gadget, f, dev->ep_in); ret = usb_ep_enable(dev->ep_in); if (ret) return ret; + config_ep_by_speed(cdev->gadget, f, dev->ep_out); ret = usb_ep_enable(dev->ep_out); if (ret) { usb_ep_disable(dev->ep_in); |