summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 13:49:08 +0100
committerMark Brown <broonie@linaro.org>2013-09-01 13:49:08 +0100
commit121a39661b8424d4207c94d46b84c924724c47bd (patch)
tree9bf12397cd37a59a069628caf8e203db2f6e66a0 /drivers/spi
parent278ac33bbd8b3ff70f9518665c892c1b6f5625b7 (diff)
parent9d3405dbbbd8418a095301d495da65bc3bc5f806 (diff)
downloadlinux-stable-121a39661b8424d4207c94d46b84c924724c47bd.tar.gz
linux-stable-121a39661b8424d4207c94d46b84c924724c47bd.tar.bz2
linux-stable-121a39661b8424d4207c94d46b84c924724c47bd.zip
Merge remote-tracking branch 'spi/topic/rspi' into spi-next
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-rspi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index 57de139f76dc..8719206a03a0 100644
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -726,7 +726,7 @@ static void rspi_release_dma(struct rspi_data *rspi)
static int rspi_remove(struct platform_device *pdev)
{
- struct rspi_data *rspi = platform_get_drvdata(pdev);
+ struct rspi_data *rspi = spi_master_get(platform_get_drvdata(pdev));
spi_unregister_master(rspi->master);
rspi_release_dma(rspi);