diff options
| author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2020-04-03 22:20:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-06-22 09:31:20 +0200 |
| commit | 6050811edffbe9ce1b264e1557875f81b64f40e4 (patch) | |
| tree | e05bb3659fb900a5889ab713744a84ddcf7aabc8 /drivers/power | |
| parent | 0fd525d817eaf9b573bd3672107b52d9aa8ade5f (diff) | |
| download | linux-6050811edffbe9ce1b264e1557875f81b64f40e4.tar.gz linux-6050811edffbe9ce1b264e1557875f81b64f40e4.tar.bz2 linux-6050811edffbe9ce1b264e1557875f81b64f40e4.zip | |
power: supply: core: fix HWMON temperature labels
commit 6b20464ad9fb5fd76ef6f219ce62156aa9639dcc upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/supply/power_supply_hwmon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/supply/power_supply_hwmon.c b/drivers/power/supply/power_supply_hwmon.c index 75cf861ba492..67b6ee60085e 100644 --- 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; } |