Merge branch 'x86-spinlocks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / hwmon / pmbus / max34440.c

diff --git a/drivers/hwmon/pmbus/max34440.c b/drivers/hwmon/pmbus/max34440.c
index fda621d..beaf5a8 100644 (file)
--- a/drivers/hwmon/pmbus/max34440.c
+++ b/drivers/hwmon/pmbus/max34440.c
@@ -93,12 +93,14 @@ static int max34440_write_word_data(struct i2c_client *client, int page,
 
 static int max34440_read_byte_data(struct i2c_client *client, int page, int reg)
 {
-       int ret;
+       int ret = 0;
        int mfg_status;
 
-       ret = pmbus_set_page(client, page);
-       if (ret < 0)
-               return ret;
+       if (page >= 0) {
+               ret = pmbus_set_page(client, page);
+               if (ret < 0)
+                       return ret;
+       }
 
        switch (reg) {
        case PMBUS_STATUS_IOUT:
@@ -224,7 +226,8 @@ static int max34440_probe(struct i2c_client *client,
 
 static int max34440_remove(struct i2c_client *client)
 {
-       return pmbus_do_remove(client);
+       pmbus_do_remove(client);
+       return 0;
 }
 
 static const struct i2c_device_id max34440_id[] = {