summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/asb100.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2014-10-03 20:24:46 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-10-03 20:24:46 +0200
commit447a8b858e4bda41c394b1bc7fdbc9dc0bdf44f6 (patch)
tree676e741f2552c9cb301e1e49c557b92bf8940f55 /drivers/hwmon/asb100.c
parentInput: i8042 - fix Asus X450LCP touchpad detection (diff)
parentInput: soc_button_array - convert to platform bus (diff)
downloadlinux-447a8b858e4bda41c394b1bc7fdbc9dc0bdf44f6.tar.xz
linux-447a8b858e4bda41c394b1bc7fdbc9dc0bdf44f6.zip
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.18.
Diffstat (limited to 'drivers/hwmon/asb100.c')
-rw-r--r--drivers/hwmon/asb100.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c
index f96063680e58..272fcc837ecc 100644
--- a/drivers/hwmon/asb100.c
+++ b/drivers/hwmon/asb100.c
@@ -510,6 +510,10 @@ static ssize_t set_vrm(struct device *dev, struct device_attribute *attr,
err = kstrtoul(buf, 10, &val);
if (err)
return err;
+
+ if (val > 255)
+ return -EINVAL;
+
data->vrm = val;
return count;
}