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
/
armada_thermal.c
diff --git
a/drivers/thermal/armada_thermal.c
b/drivers/thermal/armada_thermal.c
index 01255fd65135949ce78b7f94fde7bccc196ac75c..26b8d326546a804d2c4f954258c0cc9839113d09 100644
(file)
--- a/
drivers/thermal/armada_thermal.c
+++ b/
drivers/thermal/armada_thermal.c
@@
-155,7
+155,7
@@
static bool armada_is_valid(struct armada_thermal_priv *priv)
}
static int armada_get_temp(struct thermal_zone_device *thermal,
-
unsigned long
*temp)
+
int
*temp)
{
struct armada_thermal_priv *priv = thermal->devdata;
unsigned long reg;