diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-26 16:21:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-26 16:21:02 +0100 |
| commit | 3d09da11b59ade74502b246782552f9cb1eb59bd (patch) | |
| tree | a5ac712ac7d7e5e2c76c813f32f9bdd9be6dc1b8 /drivers/spi/spi-mpc52xx-psc.c | |
| parent | 1728ddb2ca726b150e7bf10cdd35b5c3fc5efcf3 (diff) | |
| parent | 24b5a82cf5709a4bc577f42fdaa61b23a7f58f08 (diff) | |
Merge remote-tracking branch 'spi/topic/pdata' into spi-next
Diffstat (limited to 'drivers/spi/spi-mpc52xx-psc.c')
| -rw-r--r-- | drivers/spi/spi-mpc52xx-psc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-mpc52xx-psc.c b/drivers/spi/spi-mpc52xx-psc.c index 291120b37dbb..fed0571d4dec 100644 --- a/drivers/spi/spi-mpc52xx-psc.c +++ b/drivers/spi/spi-mpc52xx-psc.c @@ -481,7 +481,7 @@ static int mpc52xx_psc_spi_of_probe(struct platform_device *op) static int mpc52xx_psc_spi_of_remove(struct platform_device *op) { - struct spi_master *master = spi_master_get(dev_get_drvdata(&op->dev)); + struct spi_master *master = spi_master_get(platform_get_drvdata(op)); struct mpc52xx_psc_spi *mps = spi_master_get_devdata(master); flush_workqueue(mps->workqueue); |