diff mbox

spi/rockchip: fixup incorrect dma direction setting

Message ID 1408506462-3686-1-git-send-email-addy.ke@rock-chips.com (mailing list archive)
State Accepted
Commit 0ac7a4904ae1a73ae4c2c18ff6a5dd2b7e03254c
Headers show

Commit Message

addy ke Aug. 20, 2014, 3:47 a.m. UTC 
Signed-off-by: Addy Ke <addy.ke@rock-chips.com>
---
 drivers/spi/spi-rockchip.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Heiko Stübner Aug. 20, 2014, 8:09 a.m. UTC | #1 
Hi Addy,

please always remember to add a real commit message, something similar to:

"Fix typo that caused the tx direction to be set twice and left out the rx 
direction."

for example.

> Signed-off-by: Addy Ke <addy.ke@rock-chips.com>
> ---
>  drivers/spi/spi-rockchip.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
> index cb8fd6f..4ef3fd3 100644
> --- a/drivers/spi/spi-rockchip.c
> +++ b/drivers/spi/spi-rockchip.c
> @@ -679,7 +679,7 @@ static int rockchip_spi_probe(struct platform_device
> *pdev) rs->dma_tx.addr = (dma_addr_t)(mem->start + ROCKCHIP_SPI_TXDR);
> rs->dma_rx.addr = (dma_addr_t)(mem->start + ROCKCHIP_SPI_RXDR);
> rs->dma_tx.direction = DMA_MEM_TO_DEV;
> -		rs->dma_tx.direction = DMA_DEV_TO_MEM;
> +		rs->dma_rx.direction = DMA_DEV_TO_MEM;
> 
>  		master->can_dma = rockchip_spi_can_dma;
>  		master->dma_tx = rs->dma_tx.ch;

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Mark Brown Aug. 20, 2014, 3:31 p.m. UTC | #2 
On Wed, Aug 20, 2014 at 11:47:42AM +0800, Addy Ke wrote:
> Signed-off-by: Addy Ke <addy.ke@rock-chips.com>

Applied, thanks.
diff mbox

Patch

diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index cb8fd6f..4ef3fd3 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -679,7 +679,7 @@  static int rockchip_spi_probe(struct platform_device *pdev)
 		rs->dma_tx.addr = (dma_addr_t)(mem->start + ROCKCHIP_SPI_TXDR);
 		rs->dma_rx.addr = (dma_addr_t)(mem->start + ROCKCHIP_SPI_RXDR);
 		rs->dma_tx.direction = DMA_MEM_TO_DEV;
-		rs->dma_tx.direction = DMA_DEV_TO_MEM;
+		rs->dma_rx.direction = DMA_DEV_TO_MEM;
 
 		master->can_dma = rockchip_spi_can_dma;
 		master->dma_tx = rs->dma_tx.ch;