Browse Source

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

Mark Brown 12 years ago
parent
commit
121a39661b
1 changed files with 1 additions and 1 deletions
  1. 1 1
      drivers/spi/spi-rspi.c

+ 1 - 1
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);