Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99ada52c authored by Nuno Sá's avatar Nuno Sá Committed by Greg Kroah-Hartman
Browse files

hwmon: Fix HWMON_P_MIN_ALARM mask 



commit 30945d31e5761436d9eba6b8cff468a5f7c9c266 upstream.

Both HWMON_P_MIN_ALARM and HWMON_P_MAX_ALARM were using
BIT(hwmon_power_max_alarm).

Fixes: aa7f29b0 ("hwmon: Add support for power min, lcrit, min_alarm and lcrit_alarm")
CC: <stable@vger.kernel.org>
Signed-off-by: default avatarNuno Sá <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20190924124945.491326-2-nuno.sa@analog.com


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b9040fab

include/linux/hwmon.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -225,7 +225,7 @@ enum hwmon_power_attributes { 
#define HWMON_P_LABEL			BIT(hwmon_power_label)

#define HWMON_P_LABEL			BIT(hwmon_power_label)

#define HWMON_P_ALARM			BIT(hwmon_power_alarm)

#define HWMON_P_ALARM			BIT(hwmon_power_alarm)

#define HWMON_P_CAP_ALARM		BIT(hwmon_power_cap_alarm)

#define HWMON_P_CAP_ALARM		BIT(hwmon_power_cap_alarm)

#define HWMON_P_MIN_ALARM		BIT(hwmon_power_max_alarm)

#define HWMON_P_MIN_ALARM		BIT(hwmon_power_min_alarm)

#define HWMON_P_MAX_ALARM		BIT(hwmon_power_max_alarm)

#define HWMON_P_MAX_ALARM		BIT(hwmon_power_max_alarm)

#define HWMON_P_LCRIT_ALARM		BIT(hwmon_power_lcrit_alarm)

#define HWMON_P_LCRIT_ALARM		BIT(hwmon_power_lcrit_alarm)

#define HWMON_P_CRIT_ALARM		BIT(hwmon_power_crit_alarm)

#define HWMON_P_CRIT_ALARM		BIT(hwmon_power_crit_alarm)