diff --git a/[refs] b/[refs]
index 23309a189357..282db0fe2bad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 680c1305e259a488f489bc887854523b6c6e0705
+refs/heads/master: 8901e1b98e1dad75c4567d03dd00a59bd6c450e8
diff --git a/trunk/drivers/spi/spi_tegra.c b/trunk/drivers/spi/spi_tegra.c
index 891e5909038c..6c3aa6ecaade 100644
--- a/trunk/drivers/spi/spi_tegra.c
+++ b/trunk/drivers/spi/spi_tegra.c
@@ -578,6 +578,7 @@ static int __devexit spi_tegra_remove(struct platform_device *pdev)
 	master = dev_get_drvdata(&pdev->dev);
 	tspi = spi_master_get_devdata(master);
 
+	spi_unregister_master(master);
 	tegra_dma_free_channel(tspi->rx_dma);
 
 	dma_free_coherent(&pdev->dev, sizeof(u32) * BB_LEN,
@@ -586,7 +587,6 @@ 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, (r->end - r->start) + 1);