Revert: d7022078269b93dc6ee613a0a8519ce2ebe4a726
Accidentally merged without proper testing.
Change-Id: Iea6c3f7cd383357ac657fd15fde08cbab86bf809
Signed-off-by: David Brown <davidb@codeaurora.org>
diff --git a/drivers/usb/gadget/f_mtp.c b/drivers/usb/gadget/f_mtp.c
index 447e815..2829231 100644
--- a/drivers/usb/gadget/f_mtp.c
+++ b/drivers/usb/gadget/f_mtp.c
@@ -1132,38 +1132,21 @@
int ret;
DBG(cdev, "mtp_function_set_alt intf: %d alt: %d\n", intf, alt);
-
- ret = config_ep_by_speed(cdev->gadget, f, dev->ep_in);
- if (ret) {
- dev->ep_in->desc = NULL;
- ERROR(cdev, "config_ep_by_speed failes for ep %s, result %d\n",
- dev->ep_in->name, ret);
+ ret = usb_ep_enable(dev->ep_in,
+ ep_choose(cdev->gadget,
+ &mtp_highspeed_in_desc,
+ &mtp_fullspeed_in_desc));
+ if (ret)
return ret;
- }
- ret = usb_ep_enable(dev->ep_in);
+ ret = usb_ep_enable(dev->ep_out,
+ ep_choose(cdev->gadget,
+ &mtp_highspeed_out_desc,
+ &mtp_fullspeed_out_desc));
if (ret) {
- ERROR(cdev, "failed to enable ep %s, result %d\n",
- dev->ep_in->name, ret);
- return ret;
- }
-
- ret = config_ep_by_speed(cdev->gadget, f, dev->ep_out);
- if (ret) {
- dev->ep_out->desc = NULL;
- ERROR(cdev, "config_ep_by_speed failes for ep %s, result %d\n",
- dev->ep_out->name, ret);
usb_ep_disable(dev->ep_in);
return ret;
}
- ret = usb_ep_enable(dev->ep_out);
- if (ret) {
- ERROR(cdev, "failed to enable ep %s, result %d\n",
- dev->ep_out->name, ret);
- usb_ep_disable(dev->ep_in);
- return ret;
- }
- dev->ep_intr->desc = &mtp_intr_desc;
- ret = usb_ep_enable(dev->ep_intr);
+ ret = usb_ep_enable(dev->ep_intr, &mtp_intr_desc);
if (ret) {
usb_ep_disable(dev->ep_out);
usb_ep_disable(dev->ep_in);