]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
V4L/DVB (6503): pvrusb2: Fix associativity logic error
authorRoel Kluin <12o3l@tiscali.nl>
Mon, 29 Oct 2007 01:15:33 +0000 (22:15 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Sun, 4 Nov 2007 23:41:25 +0000 (21:41 -0200)
if(!x & y) should either be if(!(x & y)) or if(!x && y)
    I made changes as seemed appropriate, but please review
    this is against current git.

Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/video/pvrusb2/pvrusb2-ctrl.c

index f569b00201ddb09924e854cf84f4977795fee729..46f156fb108c79ffe2506470b857466f03ea6d10 100644 (file)
@@ -410,7 +410,7 @@ static int parse_mtoken(const char *ptr,unsigned int len,
        int msk;
        *valptr = 0;
        for (idx = 0, msk = 1; valid_bits; idx++, msk <<= 1) {
-               if (!msk & valid_bits) continue;
+               if (!(msk & valid_bits)) continue;
                valid_bits &= ~msk;
                if (!names[idx]) continue;
                slen = strlen(names[idx]);