Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux...

[pandora-kernel.git] / drivers / staging / speakup / speakup_soft.c

diff --git a/drivers/staging/speakup/speakup_soft.c b/drivers/staging/speakup/speakup_soft.c
index a2c3dc4..42cdafe 100644 (file)
--- a/drivers/staging/speakup/speakup_soft.c
+++ b/drivers/staging/speakup/speakup_soft.c
@@ -273,15 +273,8 @@ static ssize_t softsynth_write(struct file *fp, const char *buf, size_t count,
 {
        unsigned long supplied_index = 0;
        int converted;
-       char indbuf[5];
-       if (count >= sizeof(indbuf))
-               return -EINVAL;
 
-       if (copy_from_user(indbuf, buf, count))
-               return -EFAULT;
-       indbuf[count] = '\0';
-
-       converted = strict_strtoul(indbuf, 0, &supplied_index);
+       converted = kstrtoul_from_user(buf, count, 0, &supplied_index);
 
        if (converted < 0)
                return converted;