aboutsummaryrefslogtreecommitdiff
path: root/lib/kstrtox.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-06 17:44:28 +0800
committerMark Brown <broonie@linaro.org>2014-03-06 17:44:28 +0800
commitd083f580e5b940834a93ab741cdf064f0324dc0f (patch)
treed034075e47d68179d2f8bf7220d26bef0ba740d3 /lib/kstrtox.c
parent931f27c6e892fdfe98896055e0df7962e21969d9 (diff)
parent13ff50c85846338bb9820abd3933227b678dc086 (diff)
Merge tag 'parse-val' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into asoc-core
regmap: Add parse_val() API This is useful for generic code built on top of regmap dealing with blocks of data.
Diffstat (limited to 'lib/kstrtox.c')
-rw-r--r--lib/kstrtox.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/kstrtox.c b/lib/kstrtox.c
index f78ae0c0c4e2..ec8da78df9be 100644
--- a/lib/kstrtox.c
+++ b/lib/kstrtox.c
@@ -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;