projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b9040fa
)
hwmon: Fix HWMON_P_MIN_ALARM mask
author
Nuno Sá
<nuno.sa@analog.com>
Tue, 24 Sep 2019 12:49:43 +0000
(14:49 +0200)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Thu, 17 Oct 2019 20:45:42 +0000
(13:45 -0700)
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
include/linux/hwmon.h
patch
|
blob
|
history
diff --git
a/include/linux/hwmon.h
b/include/linux/hwmon.h
index
9493d4a
..
8fde789
100644
(file)
--- a/
include/linux/hwmon.h
+++ b/
include/linux/hwmon.h
@@
-225,7
+225,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_m
ax
_alarm)
+#define HWMON_P_MIN_ALARM BIT(hwmon_power_m
in
_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)