Commit 5640c4c3 authored by Mike Galbraith's avatar Mike Galbraith Committed by Sasha Levin

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

Backport of 81ad4276 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: default avatarMike Galbraith <umgwanakikbuti@gmail.com>
parent af05df01
...@@ -1491,7 +1491,7 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, ...@@ -1491,7 +1491,7 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type,
{ {
struct thermal_zone_device *tz; struct thermal_zone_device *tz;
enum thermal_trip_type trip_type; enum thermal_trip_type trip_type;
int trip_temp; unsigned long trip_temp;
int result; int result;
int count; int count;
int passive = 0; int passive = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment