From 72f133a8648f9d0e96ecae0492e9942ce694edb0 Mon Sep 17 00:00:00 2001
From: Roel Kluin <12o3l@tiscali.nl>
Date: Sun, 28 Oct 2007 22:15:33 -0300
Subject: [PATCH] --- yaml --- r: 73158 b: refs/heads/master c:
 4ed53a5af75d858bd224c2cdd7604e347a63218f h: refs/heads/master v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/media/video/pvrusb2/pvrusb2-ctrl.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 489a4803849b..172527302f69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85085ad7b2cc281a94bb406172ba938870863639
+refs/heads/master: 4ed53a5af75d858bd224c2cdd7604e347a63218f
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
index f569b00201dd..46f156fb108c 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
+++ b/trunk/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]);