diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /lib/vsprintf.c | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'lib/vsprintf.c')
| -rw-r--r-- | lib/vsprintf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index fd987b17bda7..6021757a4496 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c | |||
| @@ -234,7 +234,7 @@ int strict_strto##type(const char *cp, unsigned int base, valtype *res) \ | |||
| 234 | int ret; \ | 234 | int ret; \ |
| 235 | if (*cp == '-') { \ | 235 | if (*cp == '-') { \ |
| 236 | ret = strict_strtou##type(cp+1, base, res); \ | 236 | ret = strict_strtou##type(cp+1, base, res); \ |
| 237 | if (ret != 0) \ | 237 | if (!ret) \ |
| 238 | *res = -(*res); \ | 238 | *res = -(*res); \ |
| 239 | } else \ | 239 | } else \ |
| 240 | ret = strict_strtou##type(cp, base, res); \ | 240 | ret = strict_strtou##type(cp, base, res); \ |