Merge tag 'stable/for-linus-3.8-rc7-tag-two' of git://git.kernel.org/pub/scm/linux...

[~andy/linux] / drivers / input / mouse / logips2pp.c

diff --git a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c
index faac2c3bef740e739a59e65c3633b5bf9d262399..84de2fc6acc1c4a163a2b5fed4c45a34572fe4cb 100644 (file)
--- a/drivers/input/mouse/logips2pp.c
+++ b/drivers/input/mouse/logips2pp.c
@@ -155,9 +155,14 @@ static ssize_t ps2pp_attr_show_smartscroll(struct psmouse *psmouse,
 static ssize_t ps2pp_attr_set_smartscroll(struct psmouse *psmouse, void *data,
                                          const char *buf, size_t count)
 {
-       unsigned long value;
+       unsigned int value;
+       int err;
 
-       if (strict_strtoul(buf, 10, &value) || value > 1)
+       err = kstrtouint(buf, 10, &value);
+       if (err)
+               return err;
+
+       if (value > 1)
                return -EINVAL;
 
        ps2pp_set_smartscroll(psmouse, value);