diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-03-01 13:29:55 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-03-01 13:29:55 -0500 |
| commit | 0dbd888936a23514716b8d944775bc56f731363a (patch) | |
| tree | a2c60cdc45bdcbed47680731fa8188bffe58c098 /lib/vsprintf.c | |
| parent | 0b442d2c28479332610c46e1a74e5638ab63a97d (diff) | |
| parent | d395991c117d43bfca97101a931a41d062a93852 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
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); \ |