mmc: sh_mmcif: Correct TX DMA channel allocation

patersonc · storulf · commit a32ef81c9889 · 2016-02-10T17:02:25.000+01:00
Commit 27cbd7e ("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. Fixes: 27cbd7e ("mmc: sh_mmcif: rework dma channel handling") Signed-off-by: Chris Paterson <chris.paterson2@renesas.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ static void sh_mmcif_request_dma(struct sh_mmcif_host *host)`
`445`	`445`	`pdata->slave_id_rx);`
`446`	`446`	`} else {`
`447`	`447`	`host->chan_tx = dma_request_slave_channel(dev, "tx");`
`448`		`- host->chan_tx = dma_request_slave_channel(dev, "rx");`
	`448`	`+ host->chan_rx = dma_request_slave_channel(dev, "rx");`
`449`	`449`	`}`
`450`	`450`	`dev_dbg(dev, "%s: got channel TX %p RX %p\n", __func__, host->chan_tx,`
`451`	`451`	`host->chan_rx);`