From f6cc077be0cd6d207baff8bfa36dcf64909178b1 Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Sun, 2 Aug 2009 13:00:18 +0200 Subject: [PATCH] --- yaml --- r: 156211 b: refs/heads/master c: 24e2fb615fd6b624c320cec9ea9d91a75dad902e h: refs/heads/master i: 156209: caa748d349afea0b417918b032856ebf0d94dc0a 156207: facaa12b7b65c577b684acc5eba5e41482f6478e v: v3 --- [refs] | 2 +- trunk/fs/cifs/cifs_unicode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6cdce62146de..4a229a3d8c95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4486d6ede16b362f89b29845af6fe1a26ae78a54 +refs/heads/master: 24e2fb615fd6b624c320cec9ea9d91a75dad902e diff --git a/trunk/fs/cifs/cifs_unicode.c b/trunk/fs/cifs/cifs_unicode.c index 60e3c4253de0..714a542cbafc 100644 --- a/trunk/fs/cifs/cifs_unicode.c +++ b/trunk/fs/cifs/cifs_unicode.c @@ -44,7 +44,7 @@ cifs_ucs2_bytes(const __le16 *from, int maxbytes, int maxwords = maxbytes / 2; char tmp[NLS_MAX_CHARSET_SIZE]; - for (i = 0; from[i] && i < maxwords; i++) { + for (i = 0; i < maxwords && from[i]; i++) { charlen = codepage->uni2char(le16_to_cpu(from[i]), tmp, NLS_MAX_CHARSET_SIZE); if (charlen > 0)