[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>

diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c
index eb84fb0..13aa7a4 100644 (file)
--- 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);
        }