---

yaml --- r: 248608 b: refs/heads/master c: 6586b14 h: refs/heads/master v: v3
git-mirror · May 19, 2011 · 36c836c · 36c836c
1 parent 564e7c1
commit 36c836c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -1295,17 +1295,15 @@ 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;
 
 			/*
 			 * Skip fan if not installed.
 			 * 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)))))