From ed81aa123bb0f11e50c2ac2a361d09b5292433fb Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Sun, 21 Apr 2013 09:13:28 -0700 Subject: [PATCH] --- yaml --- r: 363079 b: refs/heads/master c: 6445e6600fa632448cac64e71119310378464ad9 h: refs/heads/master i: 363077: deadf2f5220d06f076ec454d3b969fd6c5cb7774 363075: 131737787a2ccc0f941c4ce446d7d13324c28279 363071: 8d30774094395e0e9809040cf18fcbcdd3eb4597 v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/nct6775.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3862ab75c986..32938be983a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d4b3621bb613da51ae7474c50f5cb37465b6f37 +refs/heads/master: 6445e6600fa632448cac64e71119310378464ad9 diff --git a/trunk/drivers/hwmon/nct6775.c b/trunk/drivers/hwmon/nct6775.c index 14da90e09ff1..f43f5e571db9 100644 --- a/trunk/drivers/hwmon/nct6775.c +++ b/trunk/drivers/hwmon/nct6775.c @@ -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; } @@ -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); @@ -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;