summaryrefslogtreecommitdiff
path: root/linux/drivers/media
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2007-10-28 20:15:33 -0500
committerMike Isely <isely@pobox.com>2007-10-28 20:15:33 -0500
commit668a09d846c72467de7777a58c87bea71cbdc93a (patch)
tree31826cce0fe7592beb7f2304a85a934f612db654 /linux/drivers/media
parent0258645f9b36d4fb6043d59f0613f3f3efb38282 (diff)
downloadmediapointer-dvb-s2-668a09d846c72467de7777a58c87bea71cbdc93a.tar.gz
mediapointer-dvb-s2-668a09d846c72467de7777a58c87bea71cbdc93a.tar.bz2
pvrusb2: Fix associativity logic error
From: Roel Kluin <12o3l@tiscali.nl> 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>
Diffstat (limited to 'linux/drivers/media')
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
index 83d1484a9..cdbd92ed0 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
@@ -415,7 +415,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]);