summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/pmbus/ucd9000.c
diff options
context:
space:
mode:
authorGuenter Roeck <guenter.roeck@ericsson.com>2011-07-29 22:19:39 -0700
committerGuenter Roeck <guenter.roeck@ericsson.com>2011-10-24 11:09:40 -0700
commitda8e48ab483e1f54c1099bed91bfd2c302bc7ddf (patch)
tree10a2c76781ef0b1c51515d4feb71c7fa5ae6e29f /drivers/hwmon/pmbus/ucd9000.c
parent179144a0d4128e7588b3d613a14807402f5e7c37 (diff)
downloadop-kernel-dev-da8e48ab483e1f54c1099bed91bfd2c302bc7ddf.zip
op-kernel-dev-da8e48ab483e1f54c1099bed91bfd2c302bc7ddf.tar.gz
hwmon: (pmbus) Always call _pmbus_read_byte in core driver
Always call _pmbus_read_byte() instead of pmbus_read_byte() in PMBus core driver. With this change, device specific read functions can be implemented for all registers. Since the device specific read_byte function is now always called, we need to be more careful with page validations. Only fail if the passed page number is larger than 0, since -1 means "current page". Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com> Reviewed-by: Robert Coulson <robert.coulson@ericsson.com>
Diffstat (limited to 'drivers/hwmon/pmbus/ucd9000.c')
-rw-r--r--drivers/hwmon/pmbus/ucd9000.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/pmbus/ucd9000.c b/drivers/hwmon/pmbus/ucd9000.c
index 1536db6..4ff6cf2 100644
--- a/drivers/hwmon/pmbus/ucd9000.c
+++ b/drivers/hwmon/pmbus/ucd9000.c
@@ -74,7 +74,7 @@ static int ucd9000_read_byte_data(struct i2c_client *client, int page, int reg)
switch (reg) {
case PMBUS_FAN_CONFIG_12:
- if (page)
+ if (page > 0)
return -ENXIO;
ret = ucd9000_get_fan_config(client, 0);
@@ -88,7 +88,7 @@ static int ucd9000_read_byte_data(struct i2c_client *client, int page, int reg)
ret = fan_config;
break;
case PMBUS_FAN_CONFIG_34:
- if (page)
+ if (page > 0)
return -ENXIO;
ret = ucd9000_get_fan_config(client, 2);
OpenPOWER on IntegriCloud