Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

[deliverable/linux.git] / lib / string.c

diff --git a/lib/string.c b/lib/string.c
index 63077267367ea08d7770e59a9e6e6b23bb4725e7..a485d75962af5f7a6bbb4f819aa780c812fe25ca 100644 (file)
--- a/lib/string.c
+++ b/lib/string.c
@@ -320,7 +320,7 @@ char *strstrip(char *s)
                return s;
 
        end = s + size - 1;
-       while (end != s && isspace(*end))
+       while (end >= s && isspace(*end))
                end--;
        *(end + 1) = '\0';