diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-22 12:36:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-22 12:36:57 -0700 |
| commit | a4be6c77b5fac7e0446452cc61656e8a01d27276 (patch) | |
| tree | a6d449a23a10b55b6da2758adab1434ae4437863 /fs | |
| parent | abef3bd71029b80ec1bdd6c6244b5b0b99f56633 (diff) | |
| parent | c73f693989d7a7d99ec66a7065295a0c93d0b127 (diff) | |
| download | op-kernel-dev-a4be6c77b5fac7e0446452cc61656e8a01d27276.zip op-kernel-dev-a4be6c77b5fac7e0446452cc61656e8a01d27276.tar.gz | |
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/cifs_unicode.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |
