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

Commit 2ccff610 authored by Felipe Balbi's avatar Felipe Balbi Committed by Greg Kroah-Hartman
Browse files

usb: gadget: function: f_fs: pass companion descriptor along 



commit 2bfa0719ac2a9b2f3c91345873d3cdebd0296ba9 upstream.

If we're dealing with SuperSpeed endpoints, we need
to make sure to pass along the companion descriptor
and initialize fields needed by the Gadget
API. Eventually, f_fs.c should be converted to use
config_ep_by_speed() like all other functions,
though.

Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 24c0c8cc

drivers/usb/gadget/function/f_fs.c

+13 −2
Original line number Original line Diff line number Diff line
@@ -1649,11 +1649,14 @@ static int ffs_func_eps_enable(struct ffs_function *func) 
	spin_lock_irqsave(&func->ffs->eps_lock, flags);

	spin_lock_irqsave(&func->ffs->eps_lock, flags);

	do {

	do {

		struct usb_endpoint_descriptor *ds;

		struct usb_endpoint_descriptor *ds;

		struct usb_ss_ep_comp_descriptor *comp_desc = NULL;

		int needs_comp_desc = false;

		int desc_idx;

		int desc_idx;





		if (ffs->gadget->speed == USB_SPEED_SUPER)

		if (ffs->gadget->speed == USB_SPEED_SUPER) {

			desc_idx = 2;

			desc_idx = 2;

		else if (ffs->gadget->speed == USB_SPEED_HIGH)

			needs_comp_desc = true;

		} else if (ffs->gadget->speed == USB_SPEED_HIGH)

			desc_idx = 1;

			desc_idx = 1;

		else

		else

			desc_idx = 0;

			desc_idx = 0;
@@ -1670,6 +1673,14 @@ static int ffs_func_eps_enable(struct ffs_function *func) 




		ep->ep->driver_data = ep;

		ep->ep->driver_data = ep;

		ep->ep->desc = ds;

		ep->ep->desc = ds;



		comp_desc = (struct usb_ss_ep_comp_descriptor *)(ds +

				USB_DT_ENDPOINT_SIZE);

		ep->ep->maxburst = comp_desc->bMaxBurst + 1;



		if (needs_comp_desc)

			ep->ep->comp_desc = comp_desc;



		ret = usb_ep_enable(ep->ep);

		ret = usb_ep_enable(ep->ep);

		if (likely(!ret)) {

		if (likely(!ret)) {

			epfile->ep = ep;

			epfile->ep = ep;