projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'perf/urgent' into perf/core, to resolve a conflict
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
thermal
/
dove_thermal.c
diff --git
a/drivers/thermal/dove_thermal.c
b/drivers/thermal/dove_thermal.c
index 09f6e304c27461969bb0440e6f06e6cbbc8e0ecc..a0bc9de42553b81038a4a07c7a35eb9916c670e3 100644
(file)
--- a/
drivers/thermal/dove_thermal.c
+++ b/
drivers/thermal/dove_thermal.c
@@
-93,7
+93,7
@@
static int dove_init_sensor(const struct dove_thermal_priv *priv)
}
static int dove_get_temp(struct thermal_zone_device *thermal,
-
unsigned long
*temp)
+
int
*temp)
{
unsigned long reg;
struct dove_thermal_priv *priv = thermal->devdata;