projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9ba2353
)
power: supply: core: fix HWMON temperature labels
author
Michał Mirosław
<mirq-linux@rere.qmqm.pl>
Fri, 3 Apr 2020 20:20:33 +0000
(22:20 +0200)
committer
Sebastian Reichel
<sre@kernel.org>
Fri, 1 May 2020 13:43:04 +0000
(15:43 +0200)
tempX_label files are swapped compared to what
power_supply_hwmon_temp_to_property() uses. Make them match.
Cc: stable@vger.kernel.org
Fixes:
e67d4dfc9ff1
("power: supply: Add HWMON compatibility layer")
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
drivers/power/supply/power_supply_hwmon.c
patch
|
blob
|
history
diff --git
a/drivers/power/supply/power_supply_hwmon.c
b/drivers/power/supply/power_supply_hwmon.c
index
75cf861
..
67b6ee6
100644
(file)
--- a/
drivers/power/supply/power_supply_hwmon.c
+++ b/
drivers/power/supply/power_supply_hwmon.c
@@
-144,7
+144,7
@@
static int power_supply_hwmon_read_string(struct device *dev,
u32 attr, int channel,
const char **str)
{
- *str = channel ? "temp
" : "temp ambient
";
+ *str = channel ? "temp
ambient" : "temp
";
return 0;
}