| Message ID | ab8ef3e2bf15fa75572f9ad51d6e7b10c67cb494.1594231056.git.mirq-linux@rere.qmqm.pl (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 9706247d94165ef9d6f7f00308e1cd7e0cc9251d |
| Headers | show |
| Series | usb: gadget: udc: atmel: assorted fixes | expand |
On 08/07/2020 20:04:09+0200, Michał Mirosław wrote: > Fixed commit removed the offending behaviour from the driver, but missed > the comment and associated test. Remove them now. > > Fixes: 38e58986e6fc ("usb: gadget: udc: atmel: don't disable enpdoints we don't own") > Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com> > --- > drivers/usb/gadget/udc/atmel_usba_udc.c | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c > index d69f61ff0181..9153e220848d 100644 > --- a/drivers/usb/gadget/udc/atmel_usba_udc.c > +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c > @@ -676,13 +676,7 @@ static int usba_ep_disable(struct usb_ep *_ep) > > if (!ep->ep.desc) { > spin_unlock_irqrestore(&udc->lock, flags); > - /* REVISIT because this driver disables endpoints in > - * reset_all_endpoints() before calling disconnect(), > - * most gadget drivers would trigger this non-error ... > - */ > - if (udc->gadget.speed != USB_SPEED_UNKNOWN) > - DBG(DBG_ERR, "ep_disable: %s not enabled\n", > - ep->ep.name); > + DBG(DBG_ERR, "ep_disable: %s not enabled\n", ep->ep.name); > return -EINVAL; > } > ep->ep.desc = NULL; > -- > 2.20.1 >
On 7/16/20 12:44 AM, Alexandre Belloni wrote: > > On 08/07/2020 20:04:09+0200, Michał Mirosław wrote: >> Fixed commit removed the offending behaviour from the driver, but missed >> the comment and associated test. Remove them now. >> >> Fixes: 38e58986e6fc ("usb: gadget: udc: atmel: don't disable enpdoints we don't own") >> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> > Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Acked-by: Cristian Birsan <cristian.birsan@microchip.com> > >> --- >> drivers/usb/gadget/udc/atmel_usba_udc.c | 8 +------- >> 1 file changed, 1 insertion(+), 7 deletions(-) >> >> diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c >> index d69f61ff0181..9153e220848d 100644 >> --- a/drivers/usb/gadget/udc/atmel_usba_udc.c >> +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c >> @@ -676,13 +676,7 @@ static int usba_ep_disable(struct usb_ep *_ep) >> >> if (!ep->ep.desc) { >> spin_unlock_irqrestore(&udc->lock, flags); >> - /* REVISIT because this driver disables endpoints in >> - * reset_all_endpoints() before calling disconnect(), >> - * most gadget drivers would trigger this non-error ... >> - */ >> - if (udc->gadget.speed != USB_SPEED_UNKNOWN) >> - DBG(DBG_ERR, "ep_disable: %s not enabled\n", >> - ep->ep.name); >> + DBG(DBG_ERR, "ep_disable: %s not enabled\n", ep->ep.name); >> return -EINVAL; >> } >> ep->ep.desc = NULL; >> -- >> 2.20.1 >> > > -- > Alexandre Belloni, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com >
diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c index d69f61ff0181..9153e220848d 100644 --- a/drivers/usb/gadget/udc/atmel_usba_udc.c +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c @@ -676,13 +676,7 @@ static int usba_ep_disable(struct usb_ep *_ep) if (!ep->ep.desc) { spin_unlock_irqrestore(&udc->lock, flags); - /* REVISIT because this driver disables endpoints in - * reset_all_endpoints() before calling disconnect(), - * most gadget drivers would trigger this non-error ... - */ - if (udc->gadget.speed != USB_SPEED_UNKNOWN) - DBG(DBG_ERR, "ep_disable: %s not enabled\n", - ep->ep.name); + DBG(DBG_ERR, "ep_disable: %s not enabled\n", ep->ep.name); return -EINVAL; } ep->ep.desc = NULL;
Fixed commit removed the offending behaviour from the driver, but missed the comment and associated test. Remove them now. Fixes: 38e58986e6fc ("usb: gadget: udc: atmel: don't disable enpdoints we don't own") Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> --- drivers/usb/gadget/udc/atmel_usba_udc.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)