usb: renesas_usbhs: fixup fifo disable

It was necessary to check pipe condition after disable fifo.
Current driver checked it in a wrong place.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/renesas_usbhs/pipe.c b/drivers/usb/renesas_usbhs/pipe.c
index 5897ddad05f23b7ab9748799ab9254530f4563c7..bc4521c542616ff2541bded421f7ad0de5b5d197 100644 (file)
--- a/drivers/usb/renesas_usbhs/pipe.c
+++ b/drivers/usb/renesas_usbhs/pipe.c
@@ -183,7 +183,6 @@ static void usbhsp_pipe_select(struct usbhs_pipe *pipe)
 static int usbhsp_pipe_barrier(struct usbhs_pipe *pipe)
 {
        struct usbhs_priv *priv = usbhsp_pipe_to_priv(pipe);
-       struct device *dev = usbhs_priv_to_dev(priv);
        int timeout = 1024;
        u16 val;
 
@@ -206,6 +205,7 @@ static int usbhsp_pipe_barrier(struct usbhs_pipe *pipe)
         *   - "Pipe Control Registers Switching Procedure"
         */
        usbhs_write(priv, CFIFOSEL, 0);
+       usbhs_fifo_disable(pipe);
 
        do {
                val  = usbhsp_pipectrl_get(pipe);
@@ -217,21 +217,6 @@ static int usbhsp_pipe_barrier(struct usbhs_pipe *pipe)
 
        } while (timeout--);
 
-       /*
-        * force NAK
-        */
-       timeout = 1024;
-       usbhs_fifo_disable(pipe);
-       do {
-               val  = usbhsp_pipectrl_get(pipe);
-               val &= PBUSY;
-               if (!val)
-                       return 0;
-
-       } while (timeout--);
-
-       dev_err(dev, "pipe barrier failed\n");
-
        return -EBUSY;
 }
 
@@ -270,10 +255,22 @@ static void __usbhsp_pid_try_nak_if_stall(struct usbhs_pipe *pipe)
 
 void usbhs_fifo_disable(struct usbhs_pipe *pipe)
 {
+       int timeout = 1024;
+       u16 val;
+
        /* see "Pipe n Control Register" - "PID" */
        __usbhsp_pid_try_nak_if_stall(pipe);
 
        usbhsp_pipectrl_set(pipe, PID_MASK, PID_NAK);
+
+       do {
+               val  = usbhsp_pipectrl_get(pipe);
+               val &= PBUSY;
+               if (!val)
+                       break;
+
+               udelay(10);
+       } while (timeout--);
 }
 
 void usbhs_fifo_enable(struct usbhs_pipe *pipe)