diff options
| author | Mark Brown <broonie@kernel.org> | 2018-08-10 18:51:50 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-08-10 18:51:50 +0200 |
| commit | c3c7126248a0750790ee33c4bd80a1847f55f5b6 (patch) | |
| tree | 896d70ea0d5e7dd5859f7577f9d16fd12f8a16e0 /drivers/spi/spi-davinci.c | |
| parent | Linux 4.18-rc8 (diff) | |
| parent | spi: davinci: fix a NULL pointer dereference (diff) | |
| download | linux-c3c7126248a0750790ee33c4bd80a1847f55f5b6.tar.xz linux-c3c7126248a0750790ee33c4bd80a1847f55f5b6.zip | |
Merge branch 'spi-4.18' into spi-linus
Diffstat (limited to 'drivers/spi/spi-davinci.c')
| -rw-r--r-- | drivers/spi/spi-davinci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c index 577084bb911b..a02099c90c5c 100644 --- a/drivers/spi/spi-davinci.c +++ b/drivers/spi/spi-davinci.c @@ -217,7 +217,7 @@ static void davinci_spi_chipselect(struct spi_device *spi, int value) pdata = &dspi->pdata; /* program delay transfers if tx_delay is non zero */ - if (spicfg->wdelay) + if (spicfg && spicfg->wdelay) spidat1 |= SPIDAT1_WDEL; /* |