From 36c836c60b3f45b1b21cc4b198e126b4eea0edb0 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Wed, 9 Mar 2011 07:23:54 -0800 Subject: [PATCH] --- yaml --- r: 248608 b: refs/heads/master c: 6586b14c7bdec22f59dc749ead1d01d542d793b6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/pmbus_core.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 10499d3809dd..3c92064b56c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2cfa6aedb32c9c1226094ed383dc3c9b3e2ecddb +refs/heads/master: 6586b14c7bdec22f59dc749ead1d01d542d793b6 diff --git a/trunk/drivers/hwmon/pmbus_core.c b/trunk/drivers/hwmon/pmbus_core.c index 43ec1057c1f7..98799bab69ce 100644 --- a/trunk/drivers/hwmon/pmbus_core.c +++ b/trunk/drivers/hwmon/pmbus_core.c @@ -1295,9 +1295,7 @@ static void pmbus_add_fan_attributes(struct i2c_client *client, break; if (!pmbus_check_word_register(client, page, - pmbus_fan_registers[f]) - || !pmbus_check_byte_register(client, page, - pmbus_fan_config_registers[f])) + pmbus_fan_registers[f])) break; /* @@ -1305,7 +1303,7 @@ static void pmbus_add_fan_attributes(struct i2c_client *client, * Each fan configuration register covers multiple fans, * so we have to do some magic. */ - regval = pmbus_read_byte_data(client, page, + regval = _pmbus_read_byte_data(client, page, pmbus_fan_config_registers[f]); if (regval < 0 || (!(regval & (PB_FAN_1_INSTALLED >> ((f & 1) * 4)))))