Merge remote-tracking branch 'torvalds/master' into perf/urgent

[linux-2.6-microblaze.git] / drivers / thermal / st / stm_thermal.c

diff --git a/drivers/thermal/st/stm_thermal.c b/drivers/thermal/st/stm_thermal.c
index 331e2b7..5fd3fb8 100644 (file)
--- a/drivers/thermal/st/stm_thermal.c
+++ b/drivers/thermal/st/stm_thermal.c
@@ -446,14 +446,9 @@ thermal_unprepare:
 #ifdef CONFIG_PM_SLEEP
 static int stm_thermal_suspend(struct device *dev)
 {
-       int ret;
        struct stm_thermal_sensor *sensor = dev_get_drvdata(dev);
 
-       ret = stm_thermal_sensor_off(sensor);
-       if (ret)
-               return ret;
-
-       return 0;
+       return stm_thermal_sensor_off(sensor);
 }
 
 static int stm_thermal_resume(struct device *dev)