summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ks0127.c
diff options
context:
space:
mode:
authorMartin Samuelsson <sam@home.se>2007-01-07 20:50:27 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-01-15 16:25:52 -0200
commit55d5440d4587454628a850ce26703639885af678 (patch)
tree66a03135dd0e4fe0cefccd6796b8edf732b2f98a /drivers/media/video/ks0127.c
parentc6d704c8c4453f05717ba88792f70f8babf95268 (diff)
V4L/DVB (5029): Ks0127 status flags
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>
Diffstat (limited to 'drivers/media/video/ks0127.c')
-rw-r--r--drivers/media/video/ks0127.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/ks0127.c b/drivers/media/video/ks0127.c
index c1a377f797d..b6cd21e6dab 100644
--- a/drivers/media/video/ks0127.c
+++ b/drivers/media/video/ks0127.c
@@ -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