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
This commit is contained in:
@@ -328,7 +328,7 @@ cifsConvertToUTF16(__le16 *target, const char *source, int srclen,
|
|||||||
}
|
}
|
||||||
|
|
||||||
ctoUTF16_out:
|
ctoUTF16_out:
|
||||||
return i;
|
return j;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_CIFS_SMB2
|
#ifdef CONFIG_CIFS_SMB2
|
||||||
|
Reference in New Issue
Block a user