diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 13:49:03 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 13:49:03 +0100 |
| commit | 68aa4cb3374a5f47fe1f7b31e0b5893826c05c69 (patch) | |
| tree | aa350fff2ef8ef496d46820487198e9bbfe2bf77 /drivers/spi/spi-tle62x0.c | |
| parent | 11c28cfc1e4f32dc6d02373a1e80d7e83584ed21 (diff) | |
| parent | b5f9a9d5113efe11a3b9dad600a6f833274da595 (diff) | |
| download | op-kernel-dev-68aa4cb3374a5f47fe1f7b31e0b5893826c05c69.zip op-kernel-dev-68aa4cb3374a5f47fe1f7b31e0b5893826c05c69.tar.gz | |
Merge remote-tracking branch 'spi/topic/pdata' into spi-next
Diffstat (limited to 'drivers/spi/spi-tle62x0.c')
| -rw-r--r-- | drivers/spi/spi-tle62x0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-tle62x0.c b/drivers/spi/spi-tle62x0.c index 6b0874d..b5a70e3 100644 --- a/drivers/spi/spi-tle62x0.c +++ b/drivers/spi/spi-tle62x0.c @@ -247,7 +247,7 @@ static int tle62x0_probe(struct spi_device *spi) int ptr; int ret; - pdata = spi->dev.platform_data; + pdata = dev_get_platdata(&spi->dev); if (pdata == NULL) { dev_err(&spi->dev, "no device data specified\n"); return -EINVAL; |
