From: Mark Brown <broonie@kernel.org>
Date: Fri, 10 Aug 2018 16:51:50 +0000 (+0100)
Subject: Merge branch 'spi-4.18' into spi-linus
X-Git-Tag: v4.19-rc1~165^2~1
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/c3c7126248a0750790ee33c4bd80a1847f55f5b6?hp=-c

Merge branch 'spi-4.18' into spi-linus
---

c3c7126248a0750790ee33c4bd80a1847f55f5b6
diff --combined drivers/spi/spi-davinci.c
index 577084bb911b,4ffc0f495be8..a02099c90c5c
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@@ -217,7 -217,7 +217,7 @@@ static void davinci_spi_chipselect(stru
  	pdata = &dspi->pdata;
  
  	/* program delay transfers if tx_delay is non zero */
- 	if (spicfg->wdelay)
+ 	if (spicfg && spicfg->wdelay)
  		spidat1 |= SPIDAT1_WDEL;
  
  	/*
@@@ -923,10 -923,9 +923,10 @@@ static int davinci_spi_probe(struct pla
  	/* pdata in dspi is now updated and point pdata to that */
  	pdata = &dspi->pdata;
  
 -	dspi->bytes_per_word = devm_kzalloc(&pdev->dev,
 -					    sizeof(*dspi->bytes_per_word) *
 -					    pdata->num_chipselect, GFP_KERNEL);
 +	dspi->bytes_per_word = devm_kcalloc(&pdev->dev,
 +					    pdata->num_chipselect,
 +					    sizeof(*dspi->bytes_per_word),
 +					    GFP_KERNEL);
  	if (dspi->bytes_per_word == NULL) {
  		ret = -ENOMEM;
  		goto free_master;