diff options
author | Jassi Brar <jaswinder.singh@linaro.org> | 2011-10-09 02:34:20 +0100 |
---|---|---|
committer | Andy Green <andy.green@linaro.org> | 2011-10-10 04:47:09 +0100 |
commit | b0968da3a7fc121ffda698a29f2a8d0ff6108d65 (patch) | |
tree | d7fab4c06d0af85617465c02cd2e15333c20bb51 | |
parent | 374adc48afb66b8c7c642df38969502b6f251bfd (diff) | |
download | panda-b0968da3a7fc121ffda698a29f2a8d0ff6108d65.tar.gz |
usb: gadget: uplevel android code to current api
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
-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 b13633bb684..b18f9f7a5d9 100644 --- a/drivers/usb/gadget/android.c +++ b/drivers/usb/gadget/android.c @@ -1031,6 +1031,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 ae881cb9345..63d530a798b 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); |