Merge remote-tracking branch 'spi/topic/rspi' into spi-next

121a3966 · Mark Brown · 278ac33b · 9d3405db · 121a3966
Commit 121a3966 authored Sep 01, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/spi/spi-rspi.c drivers/spi/spi-rspi.c +1 -1

No files found.
--- 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);