From: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
To: Sebastian Reichel <sebastian.reichel@collabora.com>,
Guenter Roeck <linux@roeck-us.net>,
Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 3/8] power: supply: core: fix HWMON temperature labels
Date: Fri, 03 Apr 2020 18:23:31 +0200 [thread overview]
Message-ID: <f6ab03acc5118cee8cd77ed8ae11a881c3ce2a1e.1585929579.git.mirq-linux@rere.qmqm.pl> (raw)
In-Reply-To: <cover.1585929579.git.mirq-linux@rere.qmqm.pl>
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>
---
v2: split parameter checking to separate patch
---
drivers/power/supply/power_supply_hwmon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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;
}
--
2.20.1
next prev parent reply other threads:[~2020-04-03 16:23 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-03 16:23 [PATCH v2 0/8] power: supply: core: extensions and fixes Michał Mirosław
2020-04-03 16:23 ` [PATCH v2 1/8] power: supply: core: reduce power_supply_show_usb_type() parameters Michał Mirosław
2020-04-03 16:23 ` [PATCH v2 2/8] power: supply: core: allow to constify property lists Michał Mirosław
2020-04-10 20:41 ` kbuild test robot
2020-04-10 22:14 ` kbuild test robot
2020-04-03 16:23 ` Michał Mirosław [this message]
2020-04-03 16:23 ` [PATCH v2 5/8] power: supply: core: hide unused HWMON labels Michał Mirosław
2020-04-03 16:23 ` [PATCH v2 4/8] power: supply: core: tabularize HWMON temperature labels Michał Mirosław
2020-04-03 16:47 ` Guenter Roeck
2020-04-03 16:56 ` Michał Mirosław
2020-04-03 16:23 ` [PATCH v2 7/8] power: supply: core: add output voltage measurements Michał Mirosław
2020-04-03 16:23 ` [PATCH v2 6/8] power: supply: core: add input voltage/current measurements Michał Mirosław
2020-04-03 16:23 ` [PATCH v2 8/8] power: supply: core: document measurement points Michał Mirosław
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f6ab03acc5118cee8cd77ed8ae11a881c3ce2a1e.1585929579.git.mirq-linux@rere.qmqm.pl \
--to=mirq-linux@rere.qmqm.pl \
--cc=andrew.smirnov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=sebastian.reichel@collabora.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).