diff --git a/[refs] b/[refs] index 7f7846706213..763382440033 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3816c5407c800e4fb055d08f668286db6b7113f +refs/heads/master: 66f6958e69d8055277356d3cc2e7a1d734db1755 diff --git a/trunk/lib/string.c b/trunk/lib/string.c index 11df54325fb8..dc4a86341f91 100644 --- a/trunk/lib/string.c +++ b/trunk/lib/string.c @@ -360,7 +360,6 @@ char *strim(char *s) size_t size; char *end; - s = skip_spaces(s); size = strlen(s); if (!size) return s; @@ -370,7 +369,7 @@ char *strim(char *s) end--; *(end + 1) = '\0'; - return s; + return skip_spaces(s); } EXPORT_SYMBOL(strim);