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

git-mirror · Sep 1, 2013 · 121a396 · 121a396
2 parents 278ac33 + 9d3405d
commit 121a396
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);