Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6

Pull cifs fix from Steve French. * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6: cifs: fix return value in cifsConvertToUTF16

Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs fix from Steve French. * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6: cifs: fix return value in cifsConvertToUTF16
a4be6c77 · Linus Torvalds · abef3bd7 · c73f6939 · a4be6c77
Commit a4be6c77 authored Sep 22, 2012 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

fs/cifs/cifs_unicode.c fs/cifs/cifs_unicode.c +1 -1

No files found.
--- a/fs/cifs/cifs_unicode.c
+++ b/fs/cifs/cifs_unicode.c
@@ -328,7 +328,7 @@ cifsConvertToUTF16(__le16 *target, const char *source, int srclen,
 	}
 ctoUTF16_out:
-	return i;
+	return j;
 }
 #ifdef CONFIG_CIFS_SMB2