aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2012-03-04 08:10:57 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-12 10:33:00 -0700
commit170e54cfc7d0aec9a9f3cf34cd8df19fc2594305 (patch)
tree8b2c83d0c41b6a3b88362de7454d9a5f3b29ac43 /drivers/hwmon
parent85746fedf610d9d432bad65c760ef0e05b0b2140 (diff)
downloadkernel_samsung_smdk4412-170e54cfc7d0aec9a9f3cf34cd8df19fc2594305.zip
kernel_samsung_smdk4412-170e54cfc7d0aec9a9f3cf34cd8df19fc2594305.tar.gz
kernel_samsung_smdk4412-170e54cfc7d0aec9a9f3cf34cd8df19fc2594305.tar.bz2
hwmon: (pmbus_core) Fix maximum number of POUT alarm attributes
commit 7cb3c44fb1f7999e4c53b6a52de6bc25da6de079 upstream. There are up to three POUT alarm attributes, not two, since cap_alarm was added. Reported-by: Michele Petracca <mi.petracca@gmail.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/pmbus_core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hwmon/pmbus_core.c b/drivers/hwmon/pmbus_core.c
index 8e31a8e..ffa54dd 100644
--- a/drivers/hwmon/pmbus_core.c
+++ b/drivers/hwmon/pmbus_core.c
@@ -50,7 +50,8 @@
lcrit_alarm, crit_alarm */
#define PMBUS_IOUT_BOOLEANS_PER_PAGE 3 /* alarm, lcrit_alarm,
crit_alarm */
-#define PMBUS_POUT_BOOLEANS_PER_PAGE 2 /* alarm, crit_alarm */
+#define PMBUS_POUT_BOOLEANS_PER_PAGE 3 /* cap_alarm, alarm, crit_alarm
+ */
#define PMBUS_MAX_BOOLEANS_PER_FAN 2 /* alarm, fault */
#define PMBUS_MAX_BOOLEANS_PER_TEMP 4 /* min_alarm, max_alarm,
lcrit_alarm, crit_alarm */