summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-clps711x.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-clps711x.c
parent2924f096a816367c80cefc05036d8e9f5bd68f6c (diff)
parent89e8773075bae055090db518bf2085c0d40ca9d5 (diff)
Merge remote-tracking branch 'spi/topic/core' into spi-next
Diffstat (limited to 'drivers/spi/spi-clps711x.c')
-rw-r--r--drivers/spi/spi-clps711x.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c
index e322b5bf9910..17965fe225cc 100644
--- a/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@ -249,7 +249,6 @@ err_out:
if (gpio_is_valid(hw->chipselect[i]))
gpio_free(hw->chipselect[i]);
- platform_set_drvdata(pdev, NULL);
spi_master_put(master);
kfree(master);
@@ -269,7 +268,6 @@ static int spi_clps711x_remove(struct platform_device *pdev)
gpio_free(hw->chipselect[i]);
devm_clk_put(&pdev->dev, hw->spi_clk);
- platform_set_drvdata(pdev, NULL);
spi_unregister_master(master);
kfree(master);