diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-26 11:20:58 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-26 11:20:58 -0400 |
| commit | 6140b05ca351000dd844f05495198d8425ccf394 (patch) | |
| tree | 1024c1b1e07a206b509dab0aad0c8399a2a97635 /drivers/spi/spi-pxa2xx.c | |
| parent | 2924f096a816367c80cefc05036d8e9f5bd68f6c (diff) | |
| parent | 89e8773075bae055090db518bf2085c0d40ca9d5 (diff) | |
Merge remote-tracking branch 'spi/topic/core' into spi-next
Diffstat (limited to 'drivers/spi/spi-pxa2xx.c')
| -rw-r--r-- | drivers/spi/spi-pxa2xx.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index cca27d840e1f..d161d45e021e 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c | |||
| @@ -1283,9 +1283,6 @@ static int pxa2xx_spi_remove(struct platform_device *pdev) | |||
| 1283 | /* Disconnect from the SPI framework */ | 1283 | /* Disconnect from the SPI framework */ |
| 1284 | spi_unregister_master(drv_data->master); | 1284 | spi_unregister_master(drv_data->master); |
| 1285 | 1285 | ||
| 1286 | /* Prevent double remove */ | ||
| 1287 | platform_set_drvdata(pdev, NULL); | ||
| 1288 | |||
| 1289 | return 0; | 1286 | return 0; |
| 1290 | } | 1287 | } |
| 1291 | 1288 | ||