diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-17 09:37:55 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-17 09:37:55 -0400 |
| commit | 327b6b08d6ab3bf5488120ba02ed2fe06b09efe6 (patch) | |
| tree | 592b0ebc2f5f18dac0bdc0fd6ba87d2c8b07b232 /fs/cifs/misc.c | |
| parent | c973b112c76c9d8fd042991128f218a738cc8d0a (diff) | |
| parent | 2ad56496627630ebc99f06af5f81ca23e17e014e (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/cifs/misc.c')
| -rw-r--r-- | fs/cifs/misc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c index 072b4ee8c53e..20ae4153f791 100644 --- a/fs/cifs/misc.c +++ b/fs/cifs/misc.c | |||
| @@ -611,6 +611,7 @@ cifsConvertToUCS(__le16 * target, const char *source, int maxlen, | |||
| 611 | src_char = source[i]; | 611 | src_char = source[i]; |
| 612 | switch (src_char) { | 612 | switch (src_char) { |
| 613 | case 0: | 613 | case 0: |
| 614 | target[j] = 0; | ||
| 614 | goto ctoUCS_out; | 615 | goto ctoUCS_out; |
| 615 | case ':': | 616 | case ':': |
| 616 | target[j] = cpu_to_le16(UNI_COLON); | 617 | target[j] = cpu_to_le16(UNI_COLON); |