| From cb5318a5ac88e326097663de1ba766ba4b411c9a Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Nuno=20S=C3=A1?= <nuno.sa@analog.com> |
| Date: Tue, 24 Sep 2019 14:49:43 +0200 |
| Subject: [PATCH] hwmon: Fix HWMON_P_MIN_ALARM mask |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| 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> |
| |
| 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) |
| -- |
| 2.7.4 |
| |