evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: 4a1a3bb70f

Change-Id: I7b29e1d8050144b745f4885566e37d2bbca122a3
This commit is contained in:
Felipe Balbi 2017-03-18 11:22:49 +00:00 • committed by android-build-merger
commit 5bfd45cfa0
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/usb/gadget/function/f_fs.c
View file

@ -1643,11 +1643,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;
@ -1664,6 +1667,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;