diff options
| author |   Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> | 2016-04-18 16:53:40 +0900 |
|---|---|---|
| committer |   Felipe Balbi <felipe.balbi@linux.intel.com> | 2016-04-19 11:11:54 +0300 |
| commit | e789ece1823596f24076aed1b9a2182a81b0a6b7 (patch) | |
| tree | fc181a5337fee4bf00313b1d7b552a4e85a65c9a /drivers/usb/renesas_usbhs/fifo.c | |
| parent | usb: gadget: udc: core: add usb_gadget_{un}map_request_by_dev() (diff) | |
| download | linux-dev-e789ece1823596f24076aed1b9a2182a81b0a6b7.tar.xz linux-dev-e789ece1823596f24076aed1b9a2182a81b0a6b7.zip | |
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>
Diffstat (limited to 'drivers/usb/renesas_usbhs/fifo.c')
| -rw-r--r-- | drivers/usb/renesas_usbhs/fifo.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c index 000f9750149f..a805b239e805 100644 --- a/drivers/usb/renesas_usbhs/fifo.c +++ b/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) 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; @@ -896,8 +896,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 |