From: Mike Galbraith <umgwanakikbuti@gmail.com>
Date: Sat, 23 Apr 2016 00:30:39 +0000 (-0400)
Subject: Correct backport of fa3c776 ("Thermal: Ignore invalid trip points")
X-Git-Tag: v4.1.12-92~150^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=20c3a991b2d0f56e9e085bf8450dbcf1da6e27ed;p=users%2Fjedix%2Flinux-maple.git

Correct backport of fa3c776 ("Thermal: Ignore invalid trip points")

Orabug: 23331182

Backport of 81ad4276b505e987dd8ebbdf63605f92cd172b52 failed to adjust
for intervening ->get_trip_temp() argument type change, thus causing
stack protector to panic.

drivers/thermal/thermal_core.c: In function ‘thermal_zone_device_register’:
drivers/thermal/thermal_core.c:1569:41: warning: passing argument 3 of
‘tz->ops->get_trip_temp’ from incompatible pointer type [-Wincompatible-pointer-types]
   if (tz->ops->get_trip_temp(tz, count, &trip_temp))
                                         ^
drivers/thermal/thermal_core.c:1569:41: note: expected ‘long unsigned int *’
but argument is of type ‘int *’

CC: <stable@vger.kernel.org> #3.18,#4.1
Signed-off-by: Mike Galbraith <umgwanakikbuti@gmail.com>
Signed-off-by: Dan Duval <dan.duval@oracle.com>
(cherry picked from commit 5640c4c37eee293451388cd5ee74dfed3a30f32d)

Conflict:

	drivers/thermal/thermal_core.c
---

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 4108db7e10c1..e16e8e1da735 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -1459,6 +1459,7 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type,
 {
 	struct thermal_zone_device *tz;
 	enum thermal_trip_type trip_type;
+	unsigned long trip_temp;
 	int result;
 	int count;
 	int passive = 0;