]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Correct backport of fa3c776 ("Thermal: Ignore invalid trip points")
authorMike Galbraith <umgwanakikbuti@gmail.com>
Sat, 23 Apr 2016 00:30:39 +0000 (20:30 -0400)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 26 May 2016 22:46:51 +0000 (15:46 -0700)
commit20c3a991b2d0f56e9e085bf8450dbcf1da6e27ed
treec837def1e9572d6fa75bb0a93bef261402cf6385
parent70a6a296dd8ae6251704590272f93b650c2c92cc
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
drivers/thermal/thermal_core.c