summaryrefslogtreecommitdiffstats
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 12:31:40 -0700
commitf9e158428be2eddd7de7da259e1a4d5c48ce0672 (patch)
tree4d20c36b451fa613a0e6433ceaf7be486785ddfb
parent349409f0ccd8ee34a3fe3d02f843b3fcec505719 (diff)
downloadlinux-stable-f9e158428be2eddd7de7da259e1a4d5c48ce0672.tar.gz
linux-stable-f9e158428be2eddd7de7da259e1a4d5c48ce0672.tar.bz2
linux-stable-f9e158428be2eddd7de7da259e1a4d5c48ce0672.zip
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>
-rw-r--r--drivers/hwmon/pmbus/pmbus_core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
index 00460d8d8423..d89b33967a85 100644
--- a/drivers/hwmon/pmbus/pmbus_core.c
+++ b/drivers/hwmon/pmbus/pmbus_core.c
@@ -54,7 +54,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 */