diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-26 11:21:03 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-26 11:21:03 -0400 |
| commit | c87e5d97c9971f4345b221c7f5de9b2e0ea4235d (patch) | |
| tree | f7350a7b72901b45c6c28978125117106dabe076 | |
| parent | 7e016d146f90530545798ad46ec0662c1c69c505 (diff) | |
| parent | 8471090479df5aa0a439c1dd673c3d4904ea7c1d (diff) | |
Merge remote-tracking branch 'spi/topic/s3c24xx' into spi-next
| -rw-r--r-- | drivers/spi/spi-s3c24xx.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c index 02d64603fcc5..68910b310152 100644 --- a/drivers/spi/spi-s3c24xx.c +++ b/drivers/spi/spi-s3c24xx.c | |||
| @@ -667,8 +667,6 @@ static int s3c24xx_spi_remove(struct platform_device *dev) | |||
| 667 | { | 667 | { |
| 668 | struct s3c24xx_spi *hw = platform_get_drvdata(dev); | 668 | struct s3c24xx_spi *hw = platform_get_drvdata(dev); |
| 669 | 669 | ||
| 670 | platform_set_drvdata(dev, NULL); | ||
| 671 | |||
| 672 | spi_bitbang_stop(&hw->bitbang); | 670 | spi_bitbang_stop(&hw->bitbang); |
| 673 | 671 | ||
| 674 | clk_disable(hw->clk); | 672 | clk_disable(hw->clk); |