diff options
author | Mark Brown <broonie@linaro.org> | 2013-06-26 11:21:05 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-06-26 11:21:05 -0400 |
commit | 592cd34d9431736493c375b609f7f7d4458a8637 (patch) | |
tree | 033f7892b2e3e9e237a5b0019a227afc0416d944 | |
parent | cf7315b21466f6a1de0bf9f032faef4ceb0483c3 (diff) | |
parent | 69a01719012735f931cd1ed6aa0ac63e2a237c99 (diff) |
Merge remote-tracking branch 'spi/topic/txx9' into spi-next
-rw-r--r-- | drivers/spi/spi-txx9.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/spi/spi-txx9.c b/drivers/spi/spi-txx9.c index cefd9568f098..e9b7681ff6ac 100644 --- a/drivers/spi/spi-txx9.c +++ b/drivers/spi/spi-txx9.c | |||
@@ -419,7 +419,6 @@ exit: | |||
419 | clk_disable(c->clk); | 419 | clk_disable(c->clk); |
420 | clk_put(c->clk); | 420 | clk_put(c->clk); |
421 | } | 421 | } |
422 | platform_set_drvdata(dev, NULL); | ||
423 | spi_master_put(master); | 422 | spi_master_put(master); |
424 | return ret; | 423 | return ret; |
425 | } | 424 | } |
@@ -430,7 +429,6 @@ static int txx9spi_remove(struct platform_device *dev) | |||
430 | struct txx9spi *c = spi_master_get_devdata(master); | 429 | struct txx9spi *c = spi_master_get_devdata(master); |
431 | 430 | ||
432 | spi_unregister_master(master); | 431 | spi_unregister_master(master); |
433 | platform_set_drvdata(dev, NULL); | ||
434 | destroy_workqueue(c->workqueue); | 432 | destroy_workqueue(c->workqueue); |
435 | clk_disable(c->clk); | 433 | clk_disable(c->clk); |
436 | clk_put(c->clk); | 434 | clk_put(c->clk); |