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

a4be6c77 · Linus Torvalds <[email protected]> · 2012-09-22 12:36:57 -07:00

Pull cifs fix from Steve French.

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

Merge commit. Changes below are compared with the first parent: abef3bd7.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
fs/cifs/cifs_unicode.c	modified	+1	−1	View file

diff --git a/fs/cifs/cifs_unicode.c b/fs/cifs/cifs_unicode.c
index 7dab9c0..53cf2aa 100644
--- 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