From 9c9934f4df72ea99b029b7d14d3bbdf6586e3c44 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sun, 8 Jan 2012 19:34:20 +0100 Subject: [PATCH] --- yaml --- r: 292103 b: refs/heads/master c: 7b102ed66030a454eac1afce3af89eb3d03b0ce4 h: refs/heads/master i: 292101: 8d7be102655fc5e90addbedc8c49348e962cd2e1 292099: bccf473bc483a36a07fa6a93ad85a13e5a7ad7bc 292095: a23760d9ad29b1d6875e4cd6d4df29594150cfa2 v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/i5k_amb.c | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c169a043620a..78acff53ea29 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 600151b9de97bd580f9dc09199a10f0c2b65cb97 +refs/heads/master: 7b102ed66030a454eac1afce3af89eb3d03b0ce4 diff --git a/trunk/drivers/hwmon/i5k_amb.c b/trunk/drivers/hwmon/i5k_amb.c index d22f241b6a67..a18882cc073d 100644 --- a/trunk/drivers/hwmon/i5k_amb.c +++ b/trunk/drivers/hwmon/i5k_amb.c @@ -159,8 +159,12 @@ static ssize_t store_amb_min(struct device *dev, { struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct i5k_amb_data *data = dev_get_drvdata(dev); - unsigned long temp = simple_strtoul(buf, NULL, 10) / 500; + unsigned long temp; + int ret = kstrtoul(buf, 10, &temp); + if (ret < 0) + return ret; + temp = temp / 500; if (temp > 255) temp = 255; @@ -175,8 +179,12 @@ static ssize_t store_amb_mid(struct device *dev, { struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct i5k_amb_data *data = dev_get_drvdata(dev); - unsigned long temp = simple_strtoul(buf, NULL, 10) / 500; + unsigned long temp; + int ret = kstrtoul(buf, 10, &temp); + if (ret < 0) + return ret; + temp = temp / 500; if (temp > 255) temp = 255; @@ -191,8 +199,12 @@ static ssize_t store_amb_max(struct device *dev, { struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct i5k_amb_data *data = dev_get_drvdata(dev); - unsigned long temp = simple_strtoul(buf, NULL, 10) / 500; + unsigned long temp; + int ret = kstrtoul(buf, 10, &temp); + if (ret < 0) + return ret; + temp = temp / 500; if (temp > 255) temp = 255;