Skip to content

Commit ae8f22e

Browse files
brglgregkh
authored andcommitted
spi: davinci: fix a NULL pointer dereference
commit 563a53f upstream. On non-OF systems spi->controlled_data may be NULL. This causes a NULL pointer derefence on dm365-evm. Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Signed-off-by: Mark Brown <broonie@kernel.org> Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 5c45154 commit ae8f22e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/spi/spi-davinci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ static void davinci_spi_chipselect(struct spi_device *spi, int value)
215215
pdata = &dspi->pdata;
216216

217217
/* program delay transfers if tx_delay is non zero */
218-
if (spicfg->wdelay)
218+
if (spicfg && spicfg->wdelay)
219219
spidat1 |= SPIDAT1_WDEL;
220220

221221
/*

0 commit comments

Comments
 (0)