Merge commit 'v3.2-rc3' into next

[cascardo/linux.git] / drivers / input / touchscreen / ads7846.c

diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index de31ec6..4cedae6 100644 (file)
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -602,10 +602,12 @@ static ssize_t ads7846_disable_store(struct device *dev,
                                     const char *buf, size_t count)
 {
        struct ads7846 *ts = dev_get_drvdata(dev);
-       unsigned long i;
+       unsigned int i;
+       int err;
 
-       if (strict_strtoul(buf, 10, &i))
-               return -EINVAL;
+       err = kstrtouint(buf, 10, &i);
+       if (err)
+               return err;
 
        if (i)
                ads7846_disable(ts);