diff options
| author | Johannes Stezenbach <js@linuxtv.org> | 2005-05-16 21:54:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-17 07:59:28 -0700 |
| commit | 4ab3f08b28676d365f3fb8600ead325fd235711a (patch) | |
| tree | 8e6ce9955f45fe22e235088f2e9a8c8696507d1a /drivers/media | |
| parent | a65d3bb7177cbab1fca69dd97537766c2817b6b2 (diff) | |
| download | blackbird-op-linux-4ab3f08b28676d365f3fb8600ead325fd235711a.tar.gz blackbird-op-linux-4ab3f08b28676d365f3fb8600ead325fd235711a.zip | |
[PATCH] dvb: av7110: fix NTSC/PAL switching
fix NTSC -> PAL switching (std->id is a bitmap!) (Oliver Endriss)
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/dvb/ttpci/av7110_v4l.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c index eb84fb08d95c..13aa7a427580 100644 --- a/drivers/media/dvb/ttpci/av7110_v4l.c +++ b/drivers/media/dvb/ttpci/av7110_v4l.c @@ -726,11 +726,11 @@ static int std_callback(struct saa7146_dev* dev, struct saa7146_standard *std) { struct av7110 *av7110 = (struct av7110*) dev->ext_priv; - if (std->id == V4L2_STD_PAL) { + if (std->id & V4L2_STD_PAL) { av7110->vidmode = VIDEO_MODE_PAL; av7110_set_vidmode(av7110, av7110->vidmode); } - else if (std->id == V4L2_STD_NTSC) { + else if (std->id & V4L2_STD_NTSC) { av7110->vidmode = VIDEO_MODE_NTSC; av7110_set_vidmode(av7110, av7110->vidmode); } |
