Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc429982 authored by Tatyana Brokhman's avatar Tatyana Brokhman Committed by Stephen Boyd
Browse files

usb: gadget: fixes for "use config_ep_by_speed() instead of ep_choose()" 



Since f_serial is now checking if the endpoint descriptors are
null in the set_alt function, need to set them to null on
ep_disable in case of cable disconnect.

Signed-off-by: default avatarTatyana Brokhman <tlinder@codeaurora.org>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarIdo Shayevitz <idos@codeaurora.org>
parent a318834e

drivers/usb/gadget/f_accessory.c

+18 −6
Original line number Diff line number Diff line
@@ -1062,19 +1062,31 @@ static int acc_function_set_alt(struct usb_function *f, 
	DBG(cdev, "acc_function_set_alt intf: %d alt: %d\n", intf, alt);



	ret = config_ep_by_speed(cdev->gadget, f, dev->ep_in);

	if (ret)

	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);

			return ret;



	}

	ret = usb_ep_enable(dev->ep_in);

	if (ret)

	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)

	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;

	}

drivers/usb/gadget/f_mtp.c

+17 −5
Original line number Diff line number Diff line
@@ -1188,19 +1188,31 @@ static int mtp_function_set_alt(struct usb_function *f, 
	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)

	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);

		return ret;



	}

	ret = usb_ep_enable(dev->ep_in);

	if (ret)

	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)

	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;

	}