]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
usb: gadget: udc: renesas_usb3: protect usb3_ep->started in usb3_start_pipen()
authorYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Tue, 18 Jul 2017 12:26:42 +0000 (21:26 +0900)
committerFelipe Balbi <felipe.balbi@linux.intel.com>
Tue, 18 Jul 2017 13:20:31 +0000 (16:20 +0300)
This patch fixes an issue that unexpected behavior happens when
both the interrupt handler and renesas_usb3_ep_enable() are called.
In this case, since usb3_start_pipen() checked the usb3_ep->started,
but the flags was not protected. So, this patch protects the flag
by usb3->lock. Since renesas_usb3_ep_enable() for EP0 will be not called,
this patch doesn't take care of usb3_start_pipe0().

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
drivers/usb/gadget/udc/renesas_usb3.c

index 1cc5f0deefba27c37b21081a102f2fad5714b737..62dc9c7798e78a034a9e63f8c3163fcebec9e57a 100644 (file)
@@ -1415,12 +1415,12 @@ static void usb3_start_pipen(struct renesas_usb3_ep *usb3_ep,
        int ret = -EAGAIN;
        u32 enable_bits = 0;
 
+       spin_lock_irqsave(&usb3->lock, flags);
        if (usb3_ep->halt || usb3_ep->started)
-               return;
+               goto out;
        if (usb3_req != usb3_req_first)
-               return;
+               goto out;
 
-       spin_lock_irqsave(&usb3->lock, flags);
        if (usb3_pn_change(usb3, usb3_ep->num) < 0)
                goto out;