]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
lib/kstrtox.c: remove redundant cleanup
authorFelipe Contreras <felipe.contreras@gmail.com>
Thu, 23 Jan 2014 23:54:34 +0000 (15:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Jan 2014 00:36:57 +0000 (16:36 -0800)
We can't reach the cleanup code unless the flag KSTRTOX_OVERFLOW is not
set, so there's not no point in clearing a bit that we know is not set.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Acked-by: Levente Kurusa <levex@linux.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
lib/kstrtox.c

index f78ae0c0c4e2257cf96ab3a67b11f6bd6d9d11e0..ec8da78df9be9f4ea245ff398193bd1d90210573 100644 (file)
@@ -92,7 +92,6 @@ static int _kstrtoull(const char *s, unsigned int base, unsigned long long *res)
        rv = _parse_integer(s, base, &_res);
        if (rv & KSTRTOX_OVERFLOW)
                return -ERANGE;
-       rv &= ~KSTRTOX_OVERFLOW;
        if (rv == 0)
                return -EINVAL;
        s += rv;