diff mbox series

spi: dw: fix buffer end address

Message ID 1540395437-6623-1-git-send-email-jaewon02.kim@samsung.com (mailing list archive)
State New, archived
Headers show
Series spi: dw: fix buffer end address | expand

Commit Message

Jaewon Kim Oct. 24, 2018, 3:37 p.m. UTC
Buffer address can be NULL, if user does not want to receive TX/RX data.
In this case, driver should not set the rx/tx_end value with len.

Signed-off-by: Jaewon Kim <jaewon02.kim@samsung.com>
---
 drivers/spi/spi-dw.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Comments

Jaewon Kim Oct. 29, 2018, 4:35 p.m. UTC | #1
There is some side effect on this patch.

So, I revoke this patch.


18. 10. 25. 오전 12:37에 Jaewon Kim 이(가) 쓴 글:
> Buffer address can be NULL, if user does not want to receive TX/RX data.
> In this case, driver should not set the rx/tx_end value with len.
>
> Signed-off-by: Jaewon Kim <jaewon02.kim@samsung.com>
> ---
>   drivers/spi/spi-dw.c | 8 ++++++--
>   1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c
> index b705f2b..34e6fca 100644
> --- a/drivers/spi/spi-dw.c
> +++ b/drivers/spi/spi-dw.c
> @@ -293,9 +293,13 @@ static int dw_spi_transfer_one(struct spi_controller *master,
>   	dws->dma_mapped = 0;
>   
>   	dws->tx = (void *)transfer->tx_buf;
> -	dws->tx_end = dws->tx + transfer->len;
> +	dws->tx_end = dws->tx;
> +	if (dws->tx)
> +		dws->tx_end += transfer->len;
>   	dws->rx = transfer->rx_buf;
> -	dws->rx_end = dws->rx + transfer->len;
> +	dws->rx_end = dws->rx;
> +	if (dws->rx)
> +		dws->rx_end += transfer->len;
>   	dws->len = transfer->len;
>   
>   	spi_enable_chip(dws, 0);
diff mbox series

Patch

diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c
index b705f2b..34e6fca 100644
--- a/drivers/spi/spi-dw.c
+++ b/drivers/spi/spi-dw.c
@@ -293,9 +293,13 @@  static int dw_spi_transfer_one(struct spi_controller *master,
 	dws->dma_mapped = 0;
 
 	dws->tx = (void *)transfer->tx_buf;
-	dws->tx_end = dws->tx + transfer->len;
+	dws->tx_end = dws->tx;
+	if (dws->tx)
+		dws->tx_end += transfer->len;
 	dws->rx = transfer->rx_buf;
-	dws->rx_end = dws->rx + transfer->len;
+	dws->rx_end = dws->rx;
+	if (dws->rx)
+		dws->rx_end += transfer->len;
 	dws->len = transfer->len;
 
 	spi_enable_chip(dws, 0);