summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-davinci.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-08-10 19:51:50 +0300
committerMark Brown <broonie@kernel.org>2018-08-10 19:51:50 +0300
commitc3c7126248a0750790ee33c4bd80a1847f55f5b6 (patch)
tree896d70ea0d5e7dd5859f7577f9d16fd12f8a16e0 /drivers/spi/spi-davinci.c
parent1ffaddd029c867d134a1dde39f540dcc8c52e274 (diff)
parent563a53f3906a6b43692498e5b3ae891fac93a4af (diff)
downloadlinux-c3c7126248a0750790ee33c4bd80a1847f55f5b6.tar.xz
Merge branch 'spi-4.18' into spi-linus
Diffstat (limited to 'drivers/spi/spi-davinci.c')
-rw-r--r--drivers/spi/spi-davinci.c2
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;
/*