From d041a12d27e4f056010c5cd08ce2f0a4da922010 Mon Sep 17 00:00:00 2001 From: Johannes Stezenbach Date: Mon, 16 May 2005 21:54:27 -0700 Subject: [PATCH] --- yaml --- r: 1201 b: refs/heads/master c: 4ab3f08b28676d365f3fb8600ead325fd235711a h: refs/heads/master i: 1199: fc68c37b5332629cf57e50bd1e6885de26b920c9 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/ttpci/av7110_v4l.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 286551fd999d..f6a97a7e38a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a65d3bb7177cbab1fca69dd97537766c2817b6b2 +refs/heads/master: 4ab3f08b28676d365f3fb8600ead325fd235711a diff --git a/trunk/drivers/media/dvb/ttpci/av7110_v4l.c b/trunk/drivers/media/dvb/ttpci/av7110_v4l.c index eb84fb08d95c..13aa7a427580 100644 --- a/trunk/drivers/media/dvb/ttpci/av7110_v4l.c +++ b/trunk/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); }