diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-29 21:26:40 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:52:40 -0800 |
| commit | a906af8e7fa6700ecafec3bc6f543e00ea28b98e (patch) | |
| tree | 70577f2a536cb48389c51dc63286d2bc01d60dc9 /drivers/usb/gadget | |
| parent | 5aa5c1d129e3f9e416532b118820a8db9581c7a9 (diff) | |
3.1: androidusb: Updates
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Rebase-Id: R147367cd0e2188d9e797793b2cc8879e52568859
Diffstat (limited to 'drivers/usb/gadget')
| -rw-r--r-- | drivers/usb/gadget/f_accessory.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/usb/gadget/f_accessory.c b/drivers/usb/gadget/f_accessory.c index 05e65e5cd704..ae65faaf3d77 100644 --- a/drivers/usb/gadget/f_accessory.c +++ b/drivers/usb/gadget/f_accessory.c @@ -686,16 +686,12 @@ static int acc_function_set_alt(struct usb_function *f, int ret; DBG(cdev, "acc_function_set_alt intf: %d alt: %d\n", intf, alt); - ret = usb_ep_enable(dev->ep_in, - ep_choose(cdev->gadget, - &acc_highspeed_in_desc, - &acc_fullspeed_in_desc)); + config_ep_by_speed(cdev->gadget, f, dev->ep_in); + ret = usb_ep_enable(dev->ep_in); if (ret) return ret; - ret = usb_ep_enable(dev->ep_out, - ep_choose(cdev->gadget, - &acc_highspeed_out_desc, - &acc_fullspeed_out_desc)); + 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); return ret; |