diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-09-27 18:38:51 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-09-27 18:38:51 +0200 |
| commit | 570911528badd8877fb4dba2a89aeef4af09c5b4 (patch) | |
| tree | 55bba10c2b25a77f0fe3e1a436115cb9721d754c /drivers/spi | |
| parent | 929b34b825fd42d83d5cea66125966b99e429b1e (diff) | |
| parent | 9fbcdd1319b481591803d29a458add4cf79e5431 (diff) | |
Merge tag 'v4.4.158' into HEAD
This is the 4.4.158 stable release
Diffstat (limited to 'drivers/spi')
| -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 c872a2e54c4b..2603bee2ce07 100644 --- a/drivers/spi/spi-davinci.c +++ b/drivers/spi/spi-davinci.c @@ -220,7 +220,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; /* |