diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-10-23 00:19:18 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:52:34 -0800 |
| commit | 6b8121f30d001e2cbae6ede6822f70c73dc3100a (patch) | |
| tree | 32edee2c1d52b1d3390805fb1950537e84d07d2f /drivers/usb/gadget | |
| parent | c788a318f6d5e8ebf44286fedddad6c15c4a617c (diff) | |
HACK merge fixups for compile
Rebase-Id: Rbc628711479b187a90437bea94776066c7a58b54
Diffstat (limited to 'drivers/usb/gadget')
| -rw-r--r-- | drivers/usb/gadget/f_adb.c | 12 | ||||
| -rw-r--r-- | drivers/usb/gadget/f_mtp.c | 14 |
2 files changed, 9 insertions, 17 deletions
diff --git a/drivers/usb/gadget/f_adb.c b/drivers/usb/gadget/f_adb.c index d185b2cfc00d..94a793f43901 100644 --- a/drivers/usb/gadget/f_adb.c +++ b/drivers/usb/gadget/f_adb.c @@ -540,16 +540,12 @@ 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); - ret = usb_ep_enable(dev->ep_in, - ep_choose(cdev->gadget, - &adb_highspeed_in_desc, - &adb_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, - &adb_highspeed_out_desc, - &adb_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; diff --git a/drivers/usb/gadget/f_mtp.c b/drivers/usb/gadget/f_mtp.c index 2829231327d4..143086ae585d 100644 --- a/drivers/usb/gadget/f_mtp.c +++ b/drivers/usb/gadget/f_mtp.c @@ -1132,21 +1132,17 @@ static int mtp_function_set_alt(struct usb_function *f, int ret; DBG(cdev, "mtp_function_set_alt intf: %d alt: %d\n", intf, alt); - ret = usb_ep_enable(dev->ep_in, - ep_choose(cdev->gadget, - &mtp_highspeed_in_desc, - &mtp_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, - &mtp_highspeed_out_desc, - &mtp_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; } - ret = usb_ep_enable(dev->ep_intr, &mtp_intr_desc); + ret = usb_ep_enable(dev->ep_intr); if (ret) { usb_ep_disable(dev->ep_out); usb_ep_disable(dev->ep_in); |