diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-20 09:19:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-20 09:19:38 -0800 |
| commit | 252ec9e28f0cf350e246c065ffe70a2e32b84ad4 (patch) | |
| tree | d282a3293c9547da95c4e145175bd86741f5d5f4 /fs/cifs/misc.c | |
| parent | d4892279d786dd11f9d6269b3029ad3340e79597 (diff) | |
| parent | 1e6b39fbb61800e3ecee58dc8c4bca57c89365cd (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
Diffstat (limited to 'fs/cifs/misc.c')
| -rw-r--r-- | fs/cifs/misc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c index 34a06692e4f..ca27a82c54c 100644 --- a/fs/cifs/misc.c +++ b/fs/cifs/misc.c @@ -678,7 +678,7 @@ cifsConvertToUCS(__le16 * target, const char *source, int maxlen, __u16 temp; if(!mapChars) - return cifs_strtoUCS((wchar_t *) target, source, PATH_MAX, cp); + return cifs_strtoUCS(target, source, PATH_MAX, cp); for(i = 0, j = 0; i < maxlen; j++) { src_char = source[i]; |