---

yaml --- r: 328597 b: refs/heads/master c: c68025b h: refs/heads/master i: 328595: ca852a4 v: v3
git-mirror · Aug 27, 2012 · a6f5de2 · a6f5de2
1 parent 5344124
commit a6f5de2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 154390dcf826dc97b9d338305db14582c32cb58a
+refs/heads/master: c68025bf0363a7b44be2de512a88a57d57e63d81
diff --git a/trunk/drivers/spi/spi-tegra.c b/trunk/drivers/spi/spi-tegra.c
@@ -652,7 +652,7 @@ static int __devexit spi_tegra_remove(struct platform_device *pdev)
 	struct spi_tegra_data	*tspi;
 	struct resource		*r;
 
-	master = dev_get_drvdata(&pdev->dev);
+	master = spi_master_get(dev_get_drvdata(&pdev->dev));
 	tspi = spi_master_get_devdata(master);
 
 	spi_unregister_master(master);
@@ -668,6 +668,8 @@ static int __devexit spi_tegra_remove(struct platform_device *pdev)
 	clk_put(tspi->clk);
 	iounmap(tspi->base);
 
+	spi_master_put(master);
+
 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	release_mem_region(r->start, resource_size(r));