summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-05-15 07:35:16 +0800
committerGrant Likely <grant.likely@secretlab.ca>2011-05-20 00:43:07 -0600
commitc6e7b8cb11632a3b3968c6f64e179c7619eb70c0 (patch)
tree6c96a512b7563df0fcb234edbd9416b42e3c7b93 /drivers/spi
parent708a7e438806c02add92a585b0a6b4b2ae50159b (diff)
downloadblackbird-op-linux-c6e7b8cb11632a3b3968c6f64e179c7619eb70c0.tar.gz
blackbird-op-linux-c6e7b8cb11632a3b3968c6f64e179c7619eb70c0.zip
spi/spi_s3c24xx: Use spi_bitbang_stop instead of spi_unregister_master in s3c24xx_spi_remove
Calling spi_bitbang_stop() will also destroy bitbang->workqueue, which is created by calling spi_bitbang_start() in s3c24xx_spi_probe(). Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi_s3c24xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c
index 151a95e40653..1a5fcabfd565 100644
--- a/drivers/spi/spi_s3c24xx.c
+++ b/drivers/spi/spi_s3c24xx.c
@@ -668,7 +668,7 @@ static int __exit s3c24xx_spi_remove(struct platform_device *dev)
platform_set_drvdata(dev, NULL);
- spi_unregister_master(hw->master);
+ spi_bitbang_stop(&hw->bitbang);
clk_disable(hw->clk);
clk_put(hw->clk);
OpenPOWER on IntegriCloud