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-09 02:34:20 +0100 |
| commit | 451bdbef06b85c4e82538debfd7b295fa08fe501 (patch) | |
| tree | 2a945020a6d68dfad9ecd6bd865f195d6bfc6a1d | |
| parent | cc140115e24a6cc996b874914f5639f13478cab4 (diff) | |
usb: gadget: uplevel android code to current apilinaro-androidization-tracking-2011-10-13-13-16-BSTlinaro-androidization-tracking-2011-10-10-05-00-BST
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); |