ftrace/jprobes/x86: Fix conflict between jprobes and function graph tracing

[pandora-kernel.git] / fs / cifs / cifs_unicode.c

diff --git a/fs/cifs/cifs_unicode.c b/fs/cifs/cifs_unicode.c
index 1b2e180..667776e 100644 (file)
--- a/fs/cifs/cifs_unicode.c
+++ b/fs/cifs/cifs_unicode.c
@@ -327,6 +327,6 @@ cifsConvertToUCS(__le16 *target, const char *source, int srclen,
        }
 
 ctoUCS_out:
-       return i;
+       return j;
 }