From df0082dc9debe2c066f55373e9dc9642cb195f0d Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sun, 8 Jan 2012 19:34:18 +0100 Subject: [PATCH] --- yaml --- r: 292105 b: refs/heads/master c: 08f509077499907c8bae59818771ce18d3179aa9 h: refs/heads/master i: 292103: 9c9934f4df72ea99b029b7d14d3bbdf6586e3c44 v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/adm1029.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ea2c25a6db76..b919f65341ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d7c5d4f40246f0f50767a1fe6445e067a972c64 +refs/heads/master: 08f509077499907c8bae59818771ce18d3179aa9 diff --git a/trunk/drivers/hwmon/adm1029.c b/trunk/drivers/hwmon/adm1029.c index 0b8a3b145bd2..d789c334476b 100644 --- a/trunk/drivers/hwmon/adm1029.c +++ b/trunk/drivers/hwmon/adm1029.c @@ -78,7 +78,7 @@ static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, #define TEMP_FROM_REG(val) ((val) * 1000) -#define DIV_FROM_REG(val) ( 1 << (((val) >> 6) - 1)) +#define DIV_FROM_REG(val) (1 << (((val) >> 6) - 1)) /* Registers to be checked by adm1029_update_device() */ static const u8 ADM1029_REG_TEMP[] = { @@ -200,8 +200,11 @@ static ssize_t set_fan_div(struct device *dev, struct i2c_client *client = to_i2c_client(dev); struct adm1029_data *data = i2c_get_clientdata(client); struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); - long val = simple_strtol(buf, NULL, 10); u8 reg; + long val; + int ret = kstrtol(buf, 10, &val); + if (ret < 0) + return ret; mutex_lock(&data->update_lock); @@ -355,7 +358,8 @@ static int adm1029_probe(struct i2c_client *client, } /* Register sysfs hooks */ - if ((err = sysfs_create_group(&client->dev.kobj, &adm1029_group))) + err = sysfs_create_group(&client->dev.kobj, &adm1029_group); + if (err) goto exit_free; data->hwmon_dev = hwmon_device_register(&client->dev);