lkml.org 
[lkml]   [2019]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 032/131] usb: renesas_usbhs: gadget: fix unused-but-set-variable warning
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

    commit b7d44c36a6f6d956e1539e0dd42f98b26e5a4684 upstream.

    The commit b8b9c974afee ("usb: renesas_usbhs: gadget: disable all eps
    when the driver stops") causes the unused-but-set-variable warning.
    But, if the usbhsg_ep_disable() will return non-zero value, udc/core.c
    doesn't clear the ep->enabled flag. So, this driver should not return
    non-zero value, if the pipe is zero because this means the pipe is
    already disabled. Otherwise, the ep->enabled flag is never cleared
    when the usbhsg_ep_disable() is called by the renesas_usbhs driver first.

    Fixes: b8b9c974afee ("usb: renesas_usbhs: gadget: disable all eps when the driver stops")
    Fixes: 11432050f070 ("usb: renesas_usbhs: gadget: fix NULL pointer dereference in ep_disable()")
    Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
    Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/usb/renesas_usbhs/mod_gadget.c | 5 +----
    1 file changed, 1 insertion(+), 4 deletions(-)

    --- a/drivers/usb/renesas_usbhs/mod_gadget.c
    +++ b/drivers/usb/renesas_usbhs/mod_gadget.c
    @@ -641,14 +641,11 @@ static int usbhsg_ep_disable(struct usb_
    struct usbhsg_uep *uep = usbhsg_ep_to_uep(ep);
    struct usbhs_pipe *pipe;
    unsigned long flags;
    - int ret = 0;

    spin_lock_irqsave(&uep->lock, flags);
    pipe = usbhsg_uep_to_pipe(uep);
    - if (!pipe) {
    - ret = -EINVAL;
    + if (!pipe)
    goto out;
    - }

    usbhsg_pipe_disable(uep);
    usbhs_pipe_free(pipe);

    \
     
     \ /
      Last update: 2019-04-01 19:31    [W:3.148 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site