Skip to content

Commit

Permalink
V4L/DVB (5029): Ks0127 status flags
Browse files Browse the repository at this point in the history
Or status flags together in DECODER_GET_STATUS instead of and-zapping them.

Signed-off-by: Martin Samuelsson <sam@home.se>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Martin Samuelsson authored and Mauro Carvalho Chehab committed Jan 15, 2007
1 parent c6d704c commit 55d5440
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/media/video/ks0127.c
Original file line number Diff line number Diff line change
Expand Up @@ -712,13 +712,13 @@ static int ks0127_command(struct i2c_client *client,
*iarg = 0;
status = ks0127_read(ks, KS_STAT);
if (!(status & 0x20)) /* NOVID not set */
*iarg = (*iarg & DECODER_STATUS_GOOD);
*iarg = (*iarg | DECODER_STATUS_GOOD);
if ((status & 0x01)) /* CLOCK set */
*iarg = (*iarg & DECODER_STATUS_COLOR);
*iarg = (*iarg | DECODER_STATUS_COLOR);
if ((status & 0x08)) /* PALDET set */
*iarg = (*iarg & DECODER_STATUS_PAL);
*iarg = (*iarg | DECODER_STATUS_PAL);
else
*iarg = (*iarg & DECODER_STATUS_NTSC);
*iarg = (*iarg | DECODER_STATUS_NTSC);
break;

//Catch any unknown command
Expand Down

0 comments on commit 55d5440

Please sign in to comment.