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); }