Merge branch 'for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

[~andy/linux] / drivers / input / input-polldev.c

diff --git a/drivers/input/input-polldev.c b/drivers/input/input-polldev.c
index 7dfe1009fae09b6101133d8e471a0d4b1ef039cd..7f161d93203c09a7fbb31a6522ed81c00d47ca13 100644 (file)
--- a/drivers/input/input-polldev.c
+++ b/drivers/input/input-polldev.c
@@ -84,10 +84,12 @@ static ssize_t input_polldev_set_poll(struct device *dev,
 {
        struct input_polled_dev *polldev = dev_get_drvdata(dev);
        struct input_dev *input = polldev->input;
-       unsigned long interval;
+       unsigned int interval;
+       int err;
 
-       if (strict_strtoul(buf, 0, &interval))
-               return -EINVAL;
+       err = kstrtouint(buf, 0, &interval);
+       if (err)
+               return err;
 
        if (interval < polldev->poll_interval_min)
                return -EINVAL;