diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 03:51:15 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 03:51:15 -0500 |
| commit | 4ab432677957e0a064bba3690004d3244de8ad6c (patch) | |
| tree | 4ef5785f20be6f62bfc7fbe4f124e1751c9cabf5 /fs/cifs/misc.c | |
| parent | 30765528d156e58d41ed07cae8726c9105111b9d (diff) | |
| parent | 624f54be206adf970cd8eece16446b027913e533 (diff) | |
Merge branch 'master'
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]; |