summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-09-22 12:36:57 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-09-22 12:36:57 -0700
commita4be6c77b5fac7e0446452cc61656e8a01d27276 (patch)
treea6d449a23a10b55b6da2758adab1434ae4437863
parentabef3bd71029b80ec1bdd6c6244b5b0b99f56633 (diff)
parentc73f693989d7a7d99ec66a7065295a0c93d0b127 (diff)
downloadlinux-3.10-a4be6c77b5fac7e0446452cc61656e8a01d27276.tar.gz
linux-3.10-a4be6c77b5fac7e0446452cc61656e8a01d27276.tar.bz2
linux-3.10-a4be6c77b5fac7e0446452cc61656e8a01d27276.zip
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
-rw-r--r--fs/cifs/cifs_unicode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/cifs_unicode.c b/fs/cifs/cifs_unicode.c
index 7dab9c04ad5..53cf2aabce8 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