[media] exynos4-is: Initialize the ISP subdev sd->owner field

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

diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c
index 54ffd64ca3f7560a3b9563bf4087c949a32cf2c6..5e53212b984fd183f329a0fb7f7b48e778199f12 100644 (file)
--- a/drivers/thermal/armada_thermal.c
+++ b/drivers/thermal/armada_thermal.c
@@ -200,7 +200,6 @@ static int armada_thermal_exit(struct platform_device *pdev)
                platform_get_drvdata(pdev);
 
        thermal_zone_device_unregister(armada_thermal);
-       platform_set_drvdata(pdev, NULL);
 
        return 0;
 }
@@ -211,7 +210,7 @@ static struct platform_driver armada_thermal_driver = {
        .driver = {
                .name = "armada_thermal",
                .owner = THIS_MODULE,
-               .of_match_table = of_match_ptr(armada_thermal_id_table),
+               .of_match_table = armada_thermal_id_table,
        },
 };