From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Fri, 3 Apr 2020 20:20:33 +0000 (+0200)
Subject: power: supply: core: fix HWMON temperature labels
X-Git-Tag: v5.4.48~50
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6050811edffbe9ce1b264e1557875f81b64f40e4;p=platform%2Fkernel%2Flinux-rpi.git

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>
---

diff --git a/drivers/power/supply/power_supply_hwmon.c b/drivers/power/supply/power_supply_hwmon.c
index 75cf861..67b6ee6 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;
 }