From: Roel Kluin <12o3l@tiscali.nl> Date: Mon, 29 Oct 2007 01:15:33 +0000 (-0300) Subject: V4L/DVB (6503): pvrusb2: Fix associativity logic error X-Git-Tag: v2.6.24-rc2~30^2~8 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4ed53a5af75d858bd224c2cdd7604e347a63218f;p=linux-2.6-omap-h63xx.git V4L/DVB (6503): pvrusb2: Fix associativity logic error 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 Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c index f569b00201d..46f156fb108 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c +++ b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c @@ -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]);