diff --git a/[refs] b/[refs]
index a1965d7f0a9d..7d22a9430a41 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58ed90de3ef58a19c035355a4a0cd6dfef6d6b0c
+refs/heads/master: 154390dcf826dc97b9d338305db14582c32cb58a
diff --git a/trunk/drivers/spi/spi-stmp.c b/trunk/drivers/spi/spi-stmp.c
index 58e385285323..911e904b3c84 100644
--- a/trunk/drivers/spi/spi-stmp.c
+++ b/trunk/drivers/spi/spi-stmp.c
@@ -594,9 +594,7 @@ static int __devexit stmp_spi_remove(struct platform_device *dev)
 	struct stmp_spi *ss;
 	struct spi_master *master;
 
-	master = platform_get_drvdata(dev);
-	if (master == NULL)
-		goto out0;
+	master = spi_master_get(platform_get_drvdata(dev));
 	ss = spi_master_get_devdata(master);
 
 	spi_unregister_master(master);
@@ -609,8 +607,6 @@ static int __devexit stmp_spi_remove(struct platform_device *dev)
 	destroy_workqueue(ss->workqueue);
 	iounmap(ss->regs);
 	spi_master_put(master);
-	platform_set_drvdata(dev, NULL);
-out0:
 	return 0;
 }