Merge remote-tracking branch 'spi/topic/ioremap' into spi-next

[deliverable/linux.git] / drivers / spi / spi-bfin-v3.c

diff --git a/drivers/spi/spi-bfin-v3.c b/drivers/spi/spi-bfin-v3.c
index d5bab00f190b391dee1dd6b52a5a3e7c2920f87a..e4394ebf08f385f9af9d32c037c9bbc0711d3f8c 100644 (file)
--- a/drivers/spi/spi-bfin-v3.c
+++ b/drivers/spi/spi-bfin-v3.c
@@ -882,7 +882,6 @@ err_free_rx_dma:
 err_free_tx_dma:
        free_dma(tx_dma);
 err_put_master:
-       platform_set_drvdata(pdev, NULL);
        spi_master_put(master);
 
        return ret;
@@ -899,7 +898,6 @@ static int bfin_spi_remove(struct platform_device *pdev)
        free_dma(drv_data->rx_dma);
        free_dma(drv_data->tx_dma);
 
-       platform_set_drvdata(pdev, NULL);
        spi_unregister_master(drv_data->master);
        return 0;
 }