Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-bionic-kernel.git] / drivers / input / mouse / sentelic.c

diff --git a/drivers/input/mouse/sentelic.c b/drivers/input/mouse/sentelic.c
index cc7e0d4a8f93a1e5e32031478d87643d396f9a18..11c32ac8234b2d1883e9c7349962192b5aabb647 100644 (file)
--- a/drivers/input/mouse/sentelic.c
+++ b/drivers/input/mouse/sentelic.c
@@ -432,7 +432,7 @@ static int fsp_onpad_hscr(struct psmouse *psmouse, bool enable)
 static ssize_t fsp_attr_set_setreg(struct psmouse *psmouse, void *data,
                                   const char *buf, size_t count)
 {
-       int reg, val;
+       unsigned int reg, val;
        char *rest;
        ssize_t retval;
 
@@ -440,7 +440,7 @@ static ssize_t fsp_attr_set_setreg(struct psmouse *psmouse, void *data,
        if (rest == buf || *rest != ' ' || reg > 0xff)
                return -EINVAL;
 
-       retval = kstrtoint(rest + 1, 16, &val);
+       retval = kstrtouint(rest + 1, 16, &val);
        if (retval)
                return retval;
 
@@ -476,9 +476,10 @@ static ssize_t fsp_attr_set_getreg(struct psmouse *psmouse, void *data,
                                        const char *buf, size_t count)
 {
        struct fsp_data *pad = psmouse->private;
-       int reg, val, err;
+       unsigned int reg, val;
+       int err;
 
-       err = kstrtoint(buf, 16, &reg);
+       err = kstrtouint(buf, 16, &reg);
        if (err)
                return err;
 
@@ -511,9 +512,10 @@ static ssize_t fsp_attr_show_pagereg(struct psmouse *psmouse,
 static ssize_t fsp_attr_set_pagereg(struct psmouse *psmouse, void *data,
                                        const char *buf, size_t count)
 {
-       int val, err;
+       unsigned int val;
+       int err;
 
-       err = kstrtoint(buf, 16, &val);
+       err = kstrtouint(buf, 16, &val);
        if (err)
                return err;