Commit a4be6c77 authored Sep 22, 2012 by Linus Torvalds

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

fs/cifs/cifs_unicode.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -328,7 +328,7 @@ cifsConvertToUTF16(__le16 target, const char source, int srclen,
		}

		ctoUTF16_out:
		return i;
		return j;
		}

		#ifdef CONFIG_CIFS_SMB2