In near the future, since usbhsf_dma_{un}map() will use the "fifo" data,
this patch changes function call orfer in usbhsf_dma_prepare_push().

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda...@renesas.com>
---
 drivers/usb/renesas_usbhs/fifo.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c
index b4de70e..eb19dc7 100644
--- a/drivers/usb/renesas_usbhs/fifo.c
+++ b/drivers/usb/renesas_usbhs/fifo.c
@@ -880,12 +880,12 @@ static int usbhsf_dma_prepare_push(struct usbhs_pkt *pkt, 
int *is_done)
        if (!fifo)
                goto usbhsf_pio_prepare_push;
 
-       if (usbhsf_dma_map(pkt) < 0)
-               goto usbhsf_pio_prepare_push;
-
        ret = usbhsf_fifo_select(pipe, fifo, 0);
        if (ret < 0)
-               goto usbhsf_pio_prepare_push_unmap;
+               goto usbhsf_pio_prepare_push;
+
+       if (usbhsf_dma_map(pkt) < 0)
+               goto usbhsf_pio_prepare_push_unselect;
 
        pkt->trans = len;
 
@@ -894,8 +894,8 @@ static int usbhsf_dma_prepare_push(struct usbhs_pkt *pkt, 
int *is_done)
 
        return 0;
 
-usbhsf_pio_prepare_push_unmap:
-       usbhsf_dma_unmap(pkt);
+usbhsf_pio_prepare_push_unselect:
+       usbhsf_fifo_unselect(pipe, fifo);
 usbhsf_pio_prepare_push:
        /*
         * change handler to PIO
-- 
1.9.1

Reply via email to