From 05751ee5dbe76952ea3b80ec374e4de9e294179a Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Wed, 11 May 2011 21:27:00 +0800
Subject: [PATCH] --- yaml --- r: 251878 b: refs/heads/master c:
 680c1305e259a488f489bc887854523b6c6e0705 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/spi/spi_sh.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f3decfc18e33..23309a189357 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c4a1590189b426814748d2e03b95541852b3af6
+refs/heads/master: 680c1305e259a488f489bc887854523b6c6e0705
diff --git a/trunk/drivers/spi/spi_sh.c b/trunk/drivers/spi/spi_sh.c
index 869a07d375d6..9eedd71ad898 100644
--- a/trunk/drivers/spi/spi_sh.c
+++ b/trunk/drivers/spi/spi_sh.c
@@ -427,10 +427,10 @@ static int __devexit spi_sh_remove(struct platform_device *pdev)
 {
 	struct spi_sh_data *ss = dev_get_drvdata(&pdev->dev);
 
+	spi_unregister_master(ss->master);
 	destroy_workqueue(ss->workqueue);
 	free_irq(ss->irq, ss);
 	iounmap(ss->addr);
-	spi_master_put(ss->master);
 
 	return 0;
 }