diff options
author | Mark Brown <broonie@linaro.org> | 2013-06-26 16:20:58 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-06-26 16:20:58 +0100 |
commit | 6140b05ca351000dd844f05495198d8425ccf394 (patch) | |
tree | 1024c1b1e07a206b509dab0aad0c8399a2a97635 /drivers/spi/spi-gpio.c | |
parent | 2924f096a816367c80cefc05036d8e9f5bd68f6c (diff) | |
parent | 89e8773075bae055090db518bf2085c0d40ca9d5 (diff) | |
download | blackbird-op-linux-6140b05ca351000dd844f05495198d8425ccf394.tar.gz blackbird-op-linux-6140b05ca351000dd844f05495198d8425ccf394.zip |
Merge remote-tracking branch 'spi/topic/core' into spi-next
Diffstat (limited to 'drivers/spi/spi-gpio.c')
-rw-r--r-- | drivers/spi/spi-gpio.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c index a7801a889ff9..a54524cf42cc 100644 --- a/drivers/spi/spi-gpio.c +++ b/drivers/spi/spi-gpio.c @@ -512,8 +512,6 @@ static int spi_gpio_remove(struct platform_device *pdev) status = spi_bitbang_stop(&spi_gpio->bitbang); spi_master_put(spi_gpio->bitbang.master); - platform_set_drvdata(pdev, NULL); - if (SPI_MISO_GPIO != SPI_GPIO_NO_MISO) gpio_free(SPI_MISO_GPIO); if (SPI_MOSI_GPIO != SPI_GPIO_NO_MOSI) |