Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 292209
b: refs/heads/master
c: 130067d
h: refs/heads/master
i:
  292207: 0e0766a
v: v3
  • Loading branch information
Guenter Roeck authored and Guenter Roeck committed Mar 19, 2012
1 parent b2f0370 commit c50a543
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 795013333b613ba79b7df57515c9afacac6f167d
refs/heads/master: 130067d7c62dea33f82fbba96ebb042f6fac9474
15 changes: 9 additions & 6 deletions trunk/drivers/hwmon/w83l785ts.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,7 @@ struct w83l785ts_data {
unsigned long last_updated; /* in jiffies */

/* registers values */
s8 temp[2]; /* 0: input
1: critical limit */
s8 temp[2]; /* 0: input, 1: critical limit */
};

/*
Expand Down Expand Up @@ -250,8 +249,10 @@ static u8 w83l785ts_read_value(struct i2c_client *client, u8 reg, u8 defval)
struct device *dev;
const char *prefix;

/* We might be called during detection, at which point the client
isn't yet fully initialized, so we can't use dev_dbg on it */
/*
* We might be called during detection, at which point the client
* isn't yet fully initialized, so we can't use dev_dbg on it
*/
if (i2c_get_clientdata(client)) {
dev = &client->dev;
prefix = "";
Expand All @@ -260,9 +261,11 @@ static u8 w83l785ts_read_value(struct i2c_client *client, u8 reg, u8 defval)
prefix = "w83l785ts: ";
}

/* Frequent read errors have been reported on Asus boards, so we
/*
* Frequent read errors have been reported on Asus boards, so we
* retry on read errors. If it still fails (unlikely), return the
* default value requested by the caller. */
* default value requested by the caller.
*/
for (i = 1; i <= MAX_RETRIES; i++) {
value = i2c_smbus_read_byte_data(client, reg);
if (value >= 0) {
Expand Down

0 comments on commit c50a543

Please sign in to comment.