From 4fd39d6cc003c3831fed620cbc8c92f85fed9599 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Mon, 28 Jan 2013 10:19:42 -0300
Subject: [PATCH] --- yaml --- r: 357493 b: refs/heads/master c:
 fb1e7b053a41807b613247535f269108f3b4fc70 h: refs/heads/master i:   357491:
 cc222fb602e0e1fc92a72fd0fc151f20d6fb5712 v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/staging/media/go7007/wis-saa7113.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a8857bde5545..885a8cbd994b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42f9de6eab3892d7da544be1cc882530eab5b203
+refs/heads/master: fb1e7b053a41807b613247535f269108f3b4fc70
diff --git a/trunk/drivers/staging/media/go7007/wis-saa7113.c b/trunk/drivers/staging/media/go7007/wis-saa7113.c
index 8810c1e6e1ed..891cde713a47 100644
--- a/trunk/drivers/staging/media/go7007/wis-saa7113.c
+++ b/trunk/drivers/staging/media/go7007/wis-saa7113.c
@@ -141,7 +141,7 @@ static int wis_saa7113_command(struct i2c_client *client,
 		} else if (dec->norm & V4L2_STD_PAL) {
 			write_reg(client, 0x0e, 0x01);
 			write_reg(client, 0x10, 0x48);
-		} else if (dec->norm * V4L2_STD_SECAM) {
+		} else if (dec->norm & V4L2_STD_SECAM) {
 			write_reg(client, 0x0e, 0x50);
 			write_reg(client, 0x10, 0x48);
 		}