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 branches 'acpi-scan', 'acpi-tables', 'acpi-ec' and 'acpi-assorted'
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
power
/
power_supply_core.c
diff --git
a/drivers/power/power_supply_core.c
b/drivers/power/power_supply_core.c
index 869284c2e1e85e7d1035b281ffb64aae06f976e6..456987c88baab9f4b8a0d2b7224b10d659b8bddc 100644
(file)
--- a/
drivers/power/power_supply_core.c
+++ b/
drivers/power/power_supply_core.c
@@
-557,7
+557,7
@@
EXPORT_SYMBOL_GPL(power_supply_unreg_notifier);
#ifdef CONFIG_THERMAL
static int power_supply_read_temp(struct thermal_zone_device *tzd,
-
unsigned long
*temp)
+
int
*temp)
{
struct power_supply *psy;
union power_supply_propval val;