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-bfin5xx.c | |
| parent | 2924f096a816367c80cefc05036d8e9f5bd68f6c (diff) | |
| parent | 89e8773075bae055090db518bf2085c0d40ca9d5 (diff) | |
Merge remote-tracking branch 'spi/topic/core' into spi-next
Diffstat (limited to 'drivers/spi/spi-bfin5xx.c')
| -rw-r--r-- | drivers/spi/spi-bfin5xx.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/spi/spi-bfin5xx.c b/drivers/spi/spi-bfin5xx.c index e35c19cff9ca..59a73424419c 100644 --- a/drivers/spi/spi-bfin5xx.c +++ b/drivers/spi/spi-bfin5xx.c | |||
| @@ -1407,9 +1407,6 @@ static int bfin_spi_remove(struct platform_device *pdev) | |||
| 1407 | 1407 | ||
| 1408 | peripheral_free_list(drv_data->pin_req); | 1408 | peripheral_free_list(drv_data->pin_req); |
| 1409 | 1409 | ||
| 1410 | /* Prevent double remove */ | ||
| 1411 | platform_set_drvdata(pdev, NULL); | ||
| 1412 | |||
| 1413 | return 0; | 1410 | return 0; |
| 1414 | } | 1411 | } |
| 1415 | 1412 | ||