From 21f92209eda9ce0ac31fb9b616dffd9af76974ad Mon Sep 17 00:00:00 2001 From: Amit Daniel Kachhap Date: Fri, 8 Feb 2013 01:13:07 +0000 Subject: [PATCH] --- yaml --- r: 359785 b: refs/heads/master c: ce760ed3f440cfa51785c64dad9b4bd87673bb11 h: refs/heads/master i: 359783: 0fec217fad13b7ca7425ff7243c147e37140cfd5 v: v3 --- [refs] | 2 +- trunk/drivers/thermal/exynos_thermal.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e3fcc118d527..0f345a677bdc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f0a6847815837b63b05fc23878ba391701d8f6a +refs/heads/master: ce760ed3f440cfa51785c64dad9b4bd87673bb11 diff --git a/trunk/drivers/thermal/exynos_thermal.c b/trunk/drivers/thermal/exynos_thermal.c index f4dd68a25022..64aa8b445054 100644 --- a/trunk/drivers/thermal/exynos_thermal.c +++ b/trunk/drivers/thermal/exynos_thermal.c @@ -295,7 +295,7 @@ static int exynos_bind(struct thermal_zone_device *thermal, case MONITOR_ZONE: case WARN_ZONE: if (thermal_zone_bind_cooling_device(thermal, i, cdev, - level, level)) { + level, 0)) { pr_err("error binding cdev inst %d\n", i); ret = -EINVAL; } @@ -381,9 +381,9 @@ static int exynos_get_trend(struct thermal_zone_device *thermal, return ret; if (thermal->temperature >= trip_temp) - *trend = THERMAL_TREND_RAISING; + *trend = THERMAL_TREND_RAISE_FULL; else - *trend = THERMAL_TREND_DROPPING; + *trend = THERMAL_TREND_DROP_FULL; return 0; }