Merge remote-tracking branches 'asoc/topic/rt5677', 'asoc/topic/samsung' and 'asoc...

[karo-tx-linux.git] / net / sunrpc / cache.c

diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index 5199bb1a017e47b1b7503caf8075191dac1ade57..2928afffbb81ffdfea820fd1c2b87c3ae8b02a73 100644 (file)
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -1072,10 +1072,12 @@ void qword_add(char **bpp, int *lp, char *str)
 
        if (len < 0) return;
 
-       ret = string_escape_str(str, &bp, len, ESCAPE_OCTAL, "\\ \n\t");
-       if (ret < 0 || ret == len)
+       ret = string_escape_str(str, bp, len, ESCAPE_OCTAL, "\\ \n\t");
+       if (ret >= len) {
+               bp += len;
                len = -1;
-       else {
+       } else {
+               bp += ret;
                len -= ret;
                *bp++ = ' ';
                len--;