Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 220501
b: refs/heads/master
c: 476a4e5
h: refs/heads/master
i:
  220499: 1fa8e7f
v: v3
  • Loading branch information
Jean Delvare authored and Jean Delvare committed Oct 28, 2010
1 parent 30473f2 commit 055291d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 17 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: fd7f82b8a37ff4d400c2db9c9fa8f9467dc54a08
refs/heads/master: 476a4e5d3768ac72bb342166db294c0a9d2c010f
22 changes: 6 additions & 16 deletions trunk/drivers/hwmon/w83795.c
Original file line number Diff line number Diff line change
Expand Up @@ -1938,26 +1938,16 @@ static int w83795_probe(struct i2c_client *client,
for (i = 0; i < ARRAY_SIZE(data->temp); i++) {
if (!(data->has_temp & (1 << i)))
continue;
data->temp[i][TEMP_CRIT] =
w83795_read(client, W83795_REG_TEMP[i][TEMP_CRIT]);
data->temp[i][TEMP_CRIT_HYST] =
w83795_read(client, W83795_REG_TEMP[i][TEMP_CRIT_HYST]);
data->temp[i][TEMP_WARN] =
w83795_read(client, W83795_REG_TEMP[i][TEMP_WARN]);
data->temp[i][TEMP_WARN_HYST] =
w83795_read(client, W83795_REG_TEMP[i][TEMP_WARN_HYST]);
for (tmp = TEMP_CRIT; tmp <= TEMP_WARN_HYST; tmp++)
data->temp[i][tmp] =
w83795_read(client, W83795_REG_TEMP[i][tmp]);
}

/* Read the DTS limits */
if (data->enable_dts != 0) {
data->dts_ext[DTS_CRIT] =
w83795_read(client, W83795_REG_DTS_EXT(DTS_CRIT));
data->dts_ext[DTS_CRIT_HYST] =
w83795_read(client, W83795_REG_DTS_EXT(DTS_CRIT_HYST));
data->dts_ext[DTS_WARN] =
w83795_read(client, W83795_REG_DTS_EXT(DTS_WARN));
data->dts_ext[DTS_WARN_HYST] =
w83795_read(client, W83795_REG_DTS_EXT(DTS_WARN_HYST));
for (i = DTS_CRIT; i <= DTS_WARN_HYST; i++)
data->dts_ext[i] =
w83795_read(client, W83795_REG_DTS_EXT(i));
}

/* First update temp source selction */
Expand Down

0 comments on commit 055291d

Please sign in to comment.