diff mbox

mmc: sh_mmcif: Correct TX DMA channel allocation

Message ID 1455113221-18117-1-git-send-email-chris.paterson2@renesas.com (mailing list archive)
State New, archived
Headers show

Commit Message

Chris Paterson Feb. 10, 2016, 2:07 p.m. UTC
Commit 27cbd7e815a8 ("mmc: sh_mmcif: rework dma channel handling")
introduced a typo causing the TX DMA channel allocation to be overwritten
by the requested RX DMA channel.

Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>
---
 drivers/mmc/host/sh_mmcif.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ulf Hansson Feb. 10, 2016, 2:33 p.m. UTC | #1
On 10 February 2016 at 15:07, Chris Paterson
<chris.paterson2@renesas.com> wrote:
> Commit 27cbd7e815a8 ("mmc: sh_mmcif: rework dma channel handling")
> introduced a typo causing the TX DMA channel allocation to be overwritten
> by the requested RX DMA channel.
>
> Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>

Thanks, applied for fixes and I also added a corresponding fixes tag.

Kind regards
Uffe

> ---
>  drivers/mmc/host/sh_mmcif.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
> index e0c076a..8d870ce 100644
> --- a/drivers/mmc/host/sh_mmcif.c
> +++ b/drivers/mmc/host/sh_mmcif.c
> @@ -445,7 +445,7 @@ static void sh_mmcif_request_dma(struct sh_mmcif_host *host)
>                                                         pdata->slave_id_rx);
>         } else {
>                 host->chan_tx = dma_request_slave_channel(dev, "tx");
> -               host->chan_tx = dma_request_slave_channel(dev, "rx");
> +               host->chan_rx = dma_request_slave_channel(dev, "rx");
>         }
>         dev_dbg(dev, "%s: got channel TX %p RX %p\n", __func__, host->chan_tx,
>                 host->chan_rx);
> --
> 1.9.1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Laurent Pinchart Feb. 10, 2016, 2:36 p.m. UTC | #2
Hi Chris,

Thank you for the patch.

On Wednesday 10 February 2016 14:07:01 Chris Paterson wrote:
> Commit 27cbd7e815a8 ("mmc: sh_mmcif: rework dma channel handling")
> introduced a typo causing the TX DMA channel allocation to be overwritten
> by the requested RX DMA channel.
> 
> Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/mmc/host/sh_mmcif.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
> index e0c076a..8d870ce 100644
> --- a/drivers/mmc/host/sh_mmcif.c
> +++ b/drivers/mmc/host/sh_mmcif.c
> @@ -445,7 +445,7 @@ static void sh_mmcif_request_dma(struct sh_mmcif_host
> *host) pdata->slave_id_rx);
>  	} else {
>  		host->chan_tx = dma_request_slave_channel(dev, "tx");
> -		host->chan_tx = dma_request_slave_channel(dev, "rx");
> +		host->chan_rx = dma_request_slave_channel(dev, "rx");
>  	}
>  	dev_dbg(dev, "%s: got channel TX %p RX %p\n", __func__, host->chan_tx,
>  		host->chan_rx);
Arnd Bergmann Feb. 10, 2016, 2:45 p.m. UTC | #3
On Wednesday 10 February 2016 14:07:01 Chris Paterson wrote:
> Commit 27cbd7e815a8 ("mmc: sh_mmcif: rework dma channel handling")
> introduced a typo causing the TX DMA channel allocation to be overwritten
> by the requested RX DMA channel.
> 
> Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>
> ---
> 

Acked-by: Arnd Bergmann <arnd@arndb.de>

Sorry about the trouble.
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index e0c076a..8d870ce 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -445,7 +445,7 @@  static void sh_mmcif_request_dma(struct sh_mmcif_host *host)
 							pdata->slave_id_rx);
 	} else {
 		host->chan_tx = dma_request_slave_channel(dev, "tx");
-		host->chan_tx = dma_request_slave_channel(dev, "rx");
+		host->chan_rx = dma_request_slave_channel(dev, "rx");
 	}
 	dev_dbg(dev, "%s: got channel TX %p RX %p\n", __func__, host->chan_tx,
 		host->chan_rx);