Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 363079
b: refs/heads/master
c: 6445e66
h: refs/heads/master
i:
  363077: deadf2f
  363075: 1317377
  363071: 8d30774
v: v3
  • Loading branch information
Guenter Roeck committed Apr 21, 2013
1 parent dbc9367 commit ed81aa1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 6d4b3621bb613da51ae7474c50f5cb37465b6f37
refs/heads/master: 6445e6600fa632448cac64e71119310378464ad9
6 changes: 3 additions & 3 deletions trunk/drivers/hwmon/nct6775.c
Original file line number Diff line number Diff line change
Expand Up @@ -833,7 +833,7 @@ static void nct6775_update_fan_div(struct nct6775_data *data)
data->fan_div[1] = (i & 0x70) >> 4;
i = nct6775_read_value(data, NCT6775_REG_FANDIV2);
data->fan_div[2] = i & 0x7;
if (data->has_fan & (1<<3))
if (data->has_fan & (1 << 3))
data->fan_div[3] = (i & 0x70) >> 4;
}

Expand Down Expand Up @@ -1076,7 +1076,7 @@ static struct nct6775_data *nct6775_update_device(struct device *dev)

mutex_lock(&data->update_lock);

if (time_after(jiffies, data->last_updated + HZ + HZ/2)
if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
|| !data->valid) {
/* Fan clock dividers */
nct6775_update_fan_div_common(data);
Expand Down Expand Up @@ -1177,7 +1177,7 @@ store_in_reg(struct device *dev, struct device_attribute *attr, const char *buf,
return err;
mutex_lock(&data->update_lock);
data->in[nr][index] = in_to_reg(val, nr);
nct6775_write_value(data, data->REG_IN_MINMAX[index-1][nr],
nct6775_write_value(data, data->REG_IN_MINMAX[index - 1][nr],
data->in[nr][index]);
mutex_unlock(&data->update_lock);
return count;
Expand Down

0 comments on commit ed81aa1

Please sign in to comment.