Browse Source

usb: renesas_usbhs: change function call orfer in usbhsf_dma_prepare_push()

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

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Yoshihiro Shimoda 9 years ago
parent
commit
e789ece182
1 changed files with 6 additions and 6 deletions
  1. 6 6
      drivers/usb/renesas_usbhs/fifo.c

+ 6 - 6
drivers/usb/renesas_usbhs/fifo.c

@@ -881,12 +881,12 @@ static int usbhsf_dma_prepare_push(struct usbhs_pkt *pkt, int *is_done)
 	if (!fifo)
 	if (!fifo)
 		goto usbhsf_pio_prepare_push;
 		goto usbhsf_pio_prepare_push;
 
 
-	if (usbhsf_dma_map(pkt) < 0)
-		goto usbhsf_pio_prepare_push;
-
 	ret = usbhsf_fifo_select(pipe, fifo, 0);
 	ret = usbhsf_fifo_select(pipe, fifo, 0);
 	if (ret < 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;
 	pkt->trans = len;
 
 
@@ -896,8 +896,8 @@ static int usbhsf_dma_prepare_push(struct usbhs_pkt *pkt, int *is_done)
 
 
 	return 0;
 	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:
 usbhsf_pio_prepare_push:
 	/*
 	/*
 	 * change handler to PIO
 	 * change handler to PIO