Merge branch 'topic/error' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-fixed

1 files changed, 1 insertions, 5 deletions

diff --git a/lib/kstrtox.c b/lib/kstrtox.c
index d8a5cf66c316..b8e2080c1a47 100644
--- a/lib/kstrtox.c
+++ b/lib/kstrtox.c
@@ -48,11 +48,9 @@ unsigned int _parse_integer(const char *s, unsigned int base, unsigned long long
 {
         unsigned long long res;
         unsigned int rv;
-        int overflow;
 
         res = 0;
         rv = 0;
-        overflow = 0;
         while (*s) {
                 unsigned int val;
 
@@ -71,15 +69,13 @@ unsigned int _parse_integer(const char *s, unsigned int base, unsigned long long
                  */
                 if (unlikely(res & (~0ull << 60))) {
                         if (res > div_u64(ULLONG_MAX - val, base))
-                                overflow = 1;
+                                rv |= KSTRTOX_OVERFLOW;
                 }
                 res = res * base + val;
                 rv++;
                 s++;
         }
         *p = res;
-        if (overflow)
-                rv |= KSTRTOX_OVERFLOW;
         return rv;
 }