summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuibin Hong <huibin.hong@rock-chips.com>2018-10-10 11:00:32 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-11-24 08:23:33 +0100
commit74c0a15d28d1320bb8bfc88213579e45963ab665 (patch)
tree40cbf39a0e08e420ce474d10090cb124ccb164f5
parent28b6a09fbf23d2616af88b13b5654e89bda74777 (diff)
downloadlinux-stable-74c0a15d28d1320bb8bfc88213579e45963ab665.tar.gz
linux-stable-74c0a15d28d1320bb8bfc88213579e45963ab665.tar.bz2
linux-stable-74c0a15d28d1320bb8bfc88213579e45963ab665.zip
spi: rockchip: initialize dma_slave_config properly
[ Upstream commit dd8fd2cbc73f8650f651da71fc61a6e4f30c1566 ] The rxconf and txconf structs are allocated on the stack, so make sure we zero them before filling out the relevant fields. Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com> Signed-off-by: Emil Renner Berthing <kernel@esmil.dk> Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/spi/spi-rockchip.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index fdcf3076681b..185bbdce62b1 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -445,6 +445,9 @@ static int rockchip_spi_prepare_dma(struct rockchip_spi *rs)
struct dma_slave_config rxconf, txconf;
struct dma_async_tx_descriptor *rxdesc, *txdesc;
+ memset(&rxconf, 0, sizeof(rxconf));
+ memset(&txconf, 0, sizeof(txconf));
+
spin_lock_irqsave(&rs->lock, flags);
rs->state &= ~RXBUSY;
rs->state &= ~TXBUSY;