Merge branch 'spi-4.18' into spi-linus

2018-08-10 17:51:50 +01:00
parent 1ffaddd029 563a53f390
commit c3c7126248
6 changed files with 86 additions and 65 deletions
--- 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;

 	/*