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
mariux64 · Sep 22, 2012 · a4be6c7 · a4be6c7
2 parents abef3bd + c73f693
commit a4be6c7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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