Merge branches 'misc', 'drv_cleanup', 'devm-cleanup' and 'ti-soc' of .git into next

[karo-tx-linux.git] / drivers / thermal / exynos_thermal.c

diff --git a/drivers/thermal/exynos_thermal.c b/drivers/thermal/exynos_thermal.c
index 788b1ddcac6caa11709b0c383bc3d60295bdb8be..03e4bbc08bf0358028c15958e167462927e6ebaa 100644 (file)
--- a/drivers/thermal/exynos_thermal.c
+++ b/drivers/thermal/exynos_thermal.c
@@ -996,7 +996,6 @@ static int exynos_tmu_probe(struct platform_device *pdev)
 
        return 0;
 err_clk:
-       platform_set_drvdata(pdev, NULL);
        clk_unprepare(data->clk);
        return ret;
 }
@@ -1011,8 +1010,6 @@ static int exynos_tmu_remove(struct platform_device *pdev)
 
        clk_unprepare(data->clk);
 
-       platform_set_drvdata(pdev, NULL);
-
        return 0;
 }