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

[linux.git] / drivers / spi / spi-s3c64xx.c

diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 315ff1298dbf61efbea93be4fcf261e82a172e42..32ba3555f8b94cbe5de86d1ba9cbaab712d45ca6 100644 (file)
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -1400,7 +1400,6 @@ err3:
 err2:
        clk_disable_unprepare(sdd->clk);
 err0:
-       platform_set_drvdata(pdev, NULL);
        spi_master_put(master);
 
        return ret;
@@ -1421,7 +1420,6 @@ static int s3c64xx_spi_remove(struct platform_device *pdev)
 
        clk_disable_unprepare(sdd->clk);
 
-       platform_set_drvdata(pdev, NULL);
        spi_master_put(master);
 
        return 0;