diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-01-07 21:50:27 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-01-07 21:50:27 -0200 |
| commit | 7b2d351db8cb6d12561c7a58bf97908122aea601 (patch) | |
| tree | 508aef987b66c2f6461decee67468bfa5a83f3e0 /linux/drivers/media | |
| parent | 7e9b89b1cc339f60019cb0e3014cd7f0c1081fd4 (diff) | |
| download | mediapointer-dvb-s2-7b2d351db8cb6d12561c7a58bf97908122aea601.tar.gz mediapointer-dvb-s2-7b2d351db8cb6d12561c7a58bf97908122aea601.tar.bz2 | |
ks0127 status flags
From: Martin Samuelsson <sam@home.se>
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>
Cc: Ryan Drake <stiletto@mediaone.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/ks0127.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/ks0127.c b/linux/drivers/media/video/ks0127.c index c1a377f79..b6cd21e6d 100644 --- a/linux/drivers/media/video/ks0127.c +++ b/linux/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 |