diff options
| author | Mike Galbraith <umgwanakikbuti@gmail.com> | 2016-04-22 20:30:39 -0400 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-04-25 11:57:35 -0400 |
| commit | 5640c4c37eee293451388cd5ee74dfed3a30f32d (patch) | |
| tree | 7e17db720c81799b404d70ca149a85db169d91e4 | |
| parent | af05df01c7a9f4b3cf3dc29365f4c7c4e2cd53ff (diff) | |
Correct backport of fa3c776 ("Thermal: Ignore invalid trip points")
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>
| -rw-r--r-- | drivers/thermal/thermal_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 09f1e5f2f013..a61386ce41ee 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -1491,7 +1491,7 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, { struct thermal_zone_device *tz; enum thermal_trip_type trip_type; - int trip_temp; + unsigned long trip_temp; int result; int count; int passive = 0; |