| Message ID | 4c33741ba56d3c7830827c140bccf13621e59232.1585944770.git.mirq-linux@rere.qmqm.pl (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | extensions and fixes | expand |
Hi, On Fri, Apr 03, 2020 at 10:20:33PM +0200, Michał Mirosław wrote: > 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 > --- Thanks, queued. -- Sebastian > 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 >
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; }
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(-)