diff mbox

[media] staging: go7007: fix test for V4L2_STD_SECAM

Message ID 20130128141942.GC24528@elgon.mountain (mailing list archive)
State New, archived
Headers show

Commit Message

Dan Carpenter Jan. 28, 2013, 2:19 p.m. UTC
The current test doesn't make a lot of sense.  It's likely to be true,
which is what we would want in most cases.  From looking at how this is
handled in other drivers,  I think "&" was intended instead of "*".
It's an easy mistake to make because they are next to each other on the
keyboard.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Hans Verkuil Jan. 28, 2013, 2:22 p.m. UTC | #1
On Mon January 28 2013 15:19:42 Dan Carpenter wrote:
> The current test doesn't make a lot of sense.  It's likely to be true,
> which is what we would want in most cases.  From looking at how this is
> handled in other drivers,  I think "&" was intended instead of "*".
> It's an easy mistake to make because they are next to each other on the
> keyboard.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

For the record, it should indeed be '&'. Nice catch.

Acked-by: Hans Verkuil <hans.verkuil@cisco.com>

Regards,

	Hans

> 
> diff --git a/drivers/staging/media/go7007/wis-saa7113.c b/drivers/staging/media/go7007/wis-saa7113.c
> index 8810c1e..891cde7 100644
> --- a/drivers/staging/media/go7007/wis-saa7113.c
> +++ b/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);
>  		}
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/staging/media/go7007/wis-saa7113.c b/drivers/staging/media/go7007/wis-saa7113.c
index 8810c1e..891cde7 100644
--- a/drivers/staging/media/go7007/wis-saa7113.c
+++ b/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);
 		}