* [PATCH v3] usb: gadget: fix wrong endpoint desc
@ 2019-12-04 7:34 EJ Hsu
2019-12-06 2:49 ` EJ Hsu
0 siblings, 1 reply; 2+ messages in thread
From: EJ Hsu @ 2019-12-04 7:34 UTC (permalink / raw)
To: balbi; +Cc: linux-usb, EJ Hsu
Gadget driver should always use config_ep_by_speed() to initialize
usb_ep struct according to usb device's operating speed. Otherwise,
usb_ep struct may be wrong if usb devcie's operating speed is changed.
The key point in this patch is that we want to make sure the desc pointer
in usb_ep struct will be set to NULL when gadget is disconnected.
This will force it to call config_ep_by_speed() to correctly initialize
usb_ep struct based on the new operating speed when gadget is
re-connected later.
Signed-off-by: EJ Hsu <ejh@nvidia.com>
---
v2: fix the coding style
v3: fix the typo
---
drivers/usb/gadget/function/f_ecm.c | 6 +++++-
drivers/usb/gadget/function/f_rndis.c | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/gadget/function/f_ecm.c b/drivers/usb/gadget/function/f_ecm.c
index 6ce044008cf6..460d5d7c984f 100644
--- a/drivers/usb/gadget/function/f_ecm.c
+++ b/drivers/usb/gadget/function/f_ecm.c
@@ -621,8 +621,12 @@ static void ecm_disable(struct usb_function *f)
DBG(cdev, "ecm deactivated\n");
- if (ecm->port.in_ep->enabled)
+ if (ecm->port.in_ep->enabled) {
gether_disconnect(&ecm->port);
+ } else {
+ ecm->port.in_ep->desc = NULL;
+ ecm->port.out_ep->desc = NULL;
+ }
usb_ep_disable(ecm->notify);
ecm->notify->desc = NULL;
diff --git a/drivers/usb/gadget/function/f_rndis.c b/drivers/usb/gadget/function/f_rndis.c
index d48df36622b7..0d8e4a364ca6 100644
--- a/drivers/usb/gadget/function/f_rndis.c
+++ b/drivers/usb/gadget/function/f_rndis.c
@@ -618,6 +618,7 @@ static void rndis_disable(struct usb_function *f)
gether_disconnect(&rndis->port);
usb_ep_disable(rndis->notify);
+ rndis->notify->desc = NULL;
}
/*-------------------------------------------------------------------------*/
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* RE: [PATCH v3] usb: gadget: fix wrong endpoint desc
2019-12-04 7:34 [PATCH v3] usb: gadget: fix wrong endpoint desc EJ Hsu
@ 2019-12-06 2:49 ` EJ Hsu
0 siblings, 0 replies; 2+ messages in thread
From: EJ Hsu @ 2019-12-06 2:49 UTC (permalink / raw)
To: balbi; +Cc: linux-usb, WK Tsai
Reviewed-by: Peter Chen <peter.chen@nxp.com>
Add a "Reviewed-by" from Peter since this patch has been reviewed in v2 and only typo fix in v3.
Thanks,
EJ
--nvpublic
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-12-06 2:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-04 7:34 [PATCH v3] usb: gadget: fix wrong endpoint desc EJ Hsu
2019-12-06 2:49 ` EJ Hsu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).