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-altera.c | |
| parent | 2924f096a816367c80cefc05036d8e9f5bd68f6c (diff) | |
| parent | 89e8773075bae055090db518bf2085c0d40ca9d5 (diff) | |
| download | linux-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-altera.c')
| -rw-r--r-- | drivers/spi/spi-altera.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c index 6b7096e0ad68..8a6bb37910da 100644 --- a/drivers/spi/spi-altera.c +++ b/drivers/spi/spi-altera.c @@ -273,7 +273,6 @@ static int altera_spi_probe(struct platform_device *pdev) exit_busy: err = -EBUSY; exit: - platform_set_drvdata(pdev, NULL); spi_master_put(master); return err; } @@ -284,7 +283,6 @@ static int altera_spi_remove(struct platform_device *dev) struct spi_master *master = hw->bitbang.master; spi_bitbang_stop(&hw->bitbang); - platform_set_drvdata(dev, NULL); spi_master_put(master); return 0; } |