summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-ep93xx.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-06-26 16:20:58 +0100
committerMark Brown <broonie@linaro.org>2013-06-26 16:20:58 +0100
commit6140b05ca351000dd844f05495198d8425ccf394 (patch)
tree1024c1b1e07a206b509dab0aad0c8399a2a97635 /drivers/spi/spi-ep93xx.c
parent2924f096a816367c80cefc05036d8e9f5bd68f6c (diff)
parent89e8773075bae055090db518bf2085c0d40ca9d5 (diff)
downloadlinux-stable-6140b05ca351000dd844f05495198d8425ccf394.tar.gz
linux-stable-6140b05ca351000dd844f05495198d8425ccf394.tar.bz2
linux-stable-6140b05ca351000dd844f05495198d8425ccf394.zip
Merge remote-tracking branch 'spi/topic/core' into spi-next
Diffstat (limited to 'drivers/spi/spi-ep93xx.c')
-rw-r--r--drivers/spi/spi-ep93xx.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c
index f1b14977abdf..15ea07d8f8d6 100644
--- a/drivers/spi/spi-ep93xx.c
+++ b/drivers/spi/spi-ep93xx.c
@@ -1123,7 +1123,6 @@ fail_put_clock:
clk_put(espi->clk);
fail_release_master:
spi_master_put(master);
- platform_set_drvdata(pdev, NULL);
return error;
}
@@ -1158,7 +1157,6 @@ static int ep93xx_spi_remove(struct platform_device *pdev)
ep93xx_spi_release_dma(espi);
clk_put(espi->clk);
- platform_set_drvdata(pdev, NULL);
spi_unregister_master(master);
return 0;