| Message ID | 1442588308-10201-1-git-send-email-nicolas.ferre@atmel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Sep 18, 2015 at 04:58:28PM +0200, Nicolas Ferre wrote: > From: Sylvain Rochet <sylvain.rochet@finsecur.com> > > The recently added endpoint capabilities flags verification breaks Atmel > USBA because the endpoint configuration was only added when the driver > is bound using the legacy pdata interface. > > Convert endpoint configuration to new capabilities model when driver is > bound to a device tree as well. > > Signed-off-by: Sylvain Rochet <sylvain.rochet@finsecur.com> > Fixes: 47bef3865115 ("usb: gadget: atmel_usba_udc: add ep capabilities support") > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> > --- > Felipe, > > As you've just requested, here is the same patch sent to linux-usb ml. I had > added the "Fixes" and my SoB tags. > > For the record: > It is considered as a fix for 4.3. Can you please queue it for the "4.3-rc" > phase? thanks, I'll take it for -rc3 (already sent my -rc2 pull request).
diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c index 3dfada8d6061..f0f2b066ac08 100644 --- a/drivers/usb/gadget/udc/atmel_usba_udc.c +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c @@ -2002,6 +2002,17 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev, ep->udc = udc; INIT_LIST_HEAD(&ep->queue); + if (ep->index == 0) { + ep->ep.caps.type_control = true; + } else { + ep->ep.caps.type_iso = ep->can_isoc; + ep->ep.caps.type_bulk = true; + ep->ep.caps.type_int = true; + } + + ep->ep.caps.dir_in = true; + ep->ep.caps.dir_out = true; + if (i) list_add_tail(&ep->ep.ep_list, &udc->gadget.ep_list);