| From 563a53f3906a6b43692498e5b3ae891fac93a4af Mon Sep 17 00:00:00 2001 |
| From: Bartosz Golaszewski <bgolaszewski@baylibre.com> |
| Date: Fri, 10 Aug 2018 11:13:52 +0200 |
| Subject: spi: davinci: fix a NULL pointer dereference |
| |
| From: Bartosz Golaszewski <bgolaszewski@baylibre.com> |
| |
| commit 563a53f3906a6b43692498e5b3ae891fac93a4af 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> |
| |
| --- |
| drivers/spi/spi-davinci.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/spi/spi-davinci.c |
| +++ b/drivers/spi/spi-davinci.c |
| @@ -220,7 +220,7 @@ static void davinci_spi_chipselect(struc |
| pdata = &dspi->pdata; |
| |
| /* program delay transfers if tx_delay is non zero */ |
| - if (spicfg->wdelay) |
| + if (spicfg && spicfg->wdelay) |
| spidat1 |= SPIDAT1_WDEL; |
| |
| /* |
