From 92833556b1b280ca350c416b8ac7e12fb86b24ba Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Wed, 19 Sep 2012 11:27:03 -0700 Subject: [PATCH] --- yaml --- r: 326209 b: refs/heads/master c: a91698135bef4e945b0eee1b676d6ea5085177dc h: refs/heads/master i: 326207: 3e799828e3fe6acde0ae80ea0bc680d5236009d9 v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/w83791d.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3b3e3c274108..4098f215d49e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3be8102fe30c09e9b264a2f08ae2f69da7e32eb4 +refs/heads/master: a91698135bef4e945b0eee1b676d6ea5085177dc diff --git a/trunk/drivers/hwmon/w83791d.c b/trunk/drivers/hwmon/w83791d.c index 9ade4d4e2185..93ea81a4bf35 100644 --- a/trunk/drivers/hwmon/w83791d.c +++ b/trunk/drivers/hwmon/w83791d.c @@ -259,8 +259,7 @@ static u8 fan_to_reg(long rpm, int div) ((val) + 500) / 1000) /* for thermal cruise temp tolerance, 4-bits, LSB = 1 degree Celsius */ -#define TOL_TEMP_TO_REG(val) ((val) < 0 ? 0 : \ - (val) >= 15000 ? 15 : \ +#define TOL_TEMP_TO_REG(val) ((val) >= 15000 ? 15 : \ ((val) + 500) / 1000) #define BEEP_MASK_TO_REG(val) ((val) & 0xffffff) @@ -848,10 +847,10 @@ static ssize_t store_temp_target(struct device *dev, struct i2c_client *client = to_i2c_client(dev); struct w83791d_data *data = i2c_get_clientdata(client); int nr = sensor_attr->index; - unsigned long val; + long val; u8 target_mask; - if (kstrtoul(buf, 10, &val)) + if (kstrtol(buf, 10, &val)) return -EINVAL; mutex_lock(&data->update_lock);