Merge tag 'backport/v3.14.24-ltsi-rc1/sata-rcar-to-v3.18-rc5' into backport/v3.14...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / input / input-polldev.c

diff --git a/drivers/input/input-polldev.c b/drivers/input/input-polldev.c
index 7dfe100..7f161d9 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;