aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNuno Sá <nuno.sa@analog.com>2019-09-24 14:49:43 +0200
committerPaul Gortmaker <paul.gortmaker@windriver.com>2019-11-09 19:33:53 -0500
commit31012d874e0c92d55f8949a9a3a61a4520b15ed9 (patch)
tree550219e4af667e5ede78e02722e17ad6a95c3146
parent3abf2667e95a36873cf38ae7871c927a92916f9f (diff)
downloadlinux-yocto-31012d874e0c92d55f8949a9a3a61a4520b15ed9.tar.gz
linux-yocto-31012d874e0c92d55f8949a9a3a61a4520b15ed9.tar.bz2
linux-yocto-31012d874e0c92d55f8949a9a3a61a4520b15ed9.zip
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: aa7f29b07c870 ("hwmon: Add support for power min, lcrit, min_alarm and lcrit_alarm") CC: <stable@vger.kernel.org> Signed-off-by: Nuno Sá <nuno.sa@analog.com> Link: https://lore.kernel.org/r/20190924124945.491326-2-nuno.sa@analog.com Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--include/linux/hwmon.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/hwmon.h b/include/linux/hwmon.h
index 04c36b7a61dd..72579168189d 100644
--- a/include/linux/hwmon.h
+++ b/include/linux/hwmon.h
@@ -235,7 +235,7 @@ enum hwmon_power_attributes {
#define HWMON_P_LABEL BIT(hwmon_power_label)
#define HWMON_P_ALARM BIT(hwmon_power_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_LCRIT_ALARM BIT(hwmon_power_lcrit_alarm)
#define HWMON_P_CRIT_ALARM BIT(hwmon_power_crit_alarm)