diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 08:49:03 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 08:49:03 -0400 |
| commit | 68aa4cb3374a5f47fe1f7b31e0b5893826c05c69 (patch) | |
| tree | aa350fff2ef8ef496d46820487198e9bbfe2bf77 /drivers/spi/spi-davinci.c | |
| parent | 11c28cfc1e4f32dc6d02373a1e80d7e83584ed21 (diff) | |
| parent | b5f9a9d5113efe11a3b9dad600a6f833274da595 (diff) | |
Merge remote-tracking branch 'spi/topic/pdata' into spi-next
Diffstat (limited to 'drivers/spi/spi-davinci.c')
| -rw-r--r-- | drivers/spi/spi-davinci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c index 707966bd5610..8fbfe2483ffd 100644 --- a/drivers/spi/spi-davinci.c +++ b/drivers/spi/spi-davinci.c | |||
| @@ -872,8 +872,8 @@ static int davinci_spi_probe(struct platform_device *pdev) | |||
| 872 | goto free_master; | 872 | goto free_master; |
| 873 | } | 873 | } |
| 874 | 874 | ||
| 875 | if (pdev->dev.platform_data) { | 875 | if (dev_get_platdata(&pdev->dev)) { |
| 876 | pdata = pdev->dev.platform_data; | 876 | pdata = dev_get_platdata(&pdev->dev); |
| 877 | dspi->pdata = *pdata; | 877 | dspi->pdata = *pdata; |
| 878 | } else { | 878 | } else { |
| 879 | /* update dspi pdata with that from the DT */ | 879 | /* update dspi pdata with that from the DT */ |