lkml.org 
[lkml]   [2020]   [Jan]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 024/115] usb: gadget: fix wrong endpoint desc
    Date
    From: EJ Hsu <ejh@nvidia.com>

    [ Upstream commit e5b5da96da50ef30abb39cb9f694e99366404d24 ]

    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.

    Reviewed-by: Peter Chen <peter.chen@nxp.com>
    Signed-off-by: EJ Hsu <ejh@nvidia.com>
    Signed-off-by: Felipe Balbi <balbi@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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.20.1


    \
     
     \ /
      Last update: 2020-01-07 22:40    [W:3.311 / U:0.964 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site