commit 680c1305e259a488f489bc887854523b6c6e0705
author Axel Lin <axel.lin@gmail.com> Wed May 11 21:27:00 2011 +0800
committer Grant Likely <grant.likely@secretlab.ca> Fri May 20 00:43:07 2011 -0600
tree ba5ded620005a6ff939838318b07b5060617e41a
parent 0c4a1590189b426814748d2e03b95541852b3af6

spi/spi_sh: use spi_unregister_master instead of spi_master_put in remove path

spi_master_put() should only be used in error handling.
Once spi_register_master() returns success, we should call
spi_unregister_master() instead.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

drivers/spi/spi_sh.c

diff --git a/drivers/spi/spi_sh.c b/drivers/spi/spi_sh.c
index 869a07d..9eedd71 100644
--- a/drivers/spi/spi_sh.c
+++ b/drivers/spi/spi_sh.c
@@ -427,10 +427,10 @@
 {
 	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;
 }