diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 21:37:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 21:37:50 -0800 |
| commit | 5e04e7fe774794b837e1d3897e6b96ae2d06679a (patch) | |
| tree | c793e7d26f2d0e5448908b5c95756831d612c9fd /fs/cifs/cifs_unicode.c | |
| parent | a5cf8b7dc5ae69c65ef366325dfc1abb507276c7 (diff) | |
| parent | 1b397f4f1c167dbf06397b3182fca521c00125c4 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
Diffstat (limited to 'fs/cifs/cifs_unicode.c')
| -rw-r--r-- | fs/cifs/cifs_unicode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/cifs/cifs_unicode.c b/fs/cifs/cifs_unicode.c index 99a096d3f84..4e12053f080 100644 --- a/fs/cifs/cifs_unicode.c +++ b/fs/cifs/cifs_unicode.c @@ -74,10 +74,11 @@ cifs_strtoUCS(wchar_t * to, const char *from, int len, cERROR(1, ("cifs_strtoUCS: char2uni returned %d", charlen)); - to[i] = cpu_to_le16(0x003f); /* a question mark */ + /* A question mark */ + to[i] = (wchar_t)cpu_to_le16(0x003f); charlen = 1; } else - to[i] = cpu_to_le16(to[i]); + to[i] = (wchar_t)cpu_to_le16(to[i]); } |