summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-06-26 16:21:05 +0100
committerMark Brown <broonie@linaro.org>2013-06-26 16:21:05 +0100
commit592cd34d9431736493c375b609f7f7d4458a8637 (patch)
tree033f7892b2e3e9e237a5b0019a227afc0416d944 /drivers/spi
parentcf7315b21466f6a1de0bf9f032faef4ceb0483c3 (diff)
parent69a01719012735f931cd1ed6aa0ac63e2a237c99 (diff)
downloadop-kernel-dev-592cd34d9431736493c375b609f7f7d4458a8637.zip
op-kernel-dev-592cd34d9431736493c375b609f7f7d4458a8637.tar.gz
Merge remote-tracking branch 'spi/topic/txx9' into spi-next
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-txx9.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/spi/spi-txx9.c b/drivers/spi/spi-txx9.c
index cefd956..e9b7681 100644
--- a/drivers/spi/spi-txx9.c
+++ b/drivers/spi/spi-txx9.c
@@ -419,7 +419,6 @@ exit:
clk_disable(c->clk);
clk_put(c->clk);
}
- platform_set_drvdata(dev, NULL);
spi_master_put(master);
return ret;
}
@@ -430,7 +429,6 @@ static int txx9spi_remove(struct platform_device *dev)
struct txx9spi *c = spi_master_get_devdata(master);
spi_unregister_master(master);
- platform_set_drvdata(dev, NULL);
destroy_workqueue(c->workqueue);
clk_disable(c->clk);
clk_put(c->clk);
OpenPOWER on IntegriCloud