V4L/DVB (5110): Keep the previous tvnorm default for cx88 and cx88-blackbird

The video_ioctl2 conversion replaced the default from NTSC to PAL_BG.
This broke cx88-blackbird. Probably, there are some badness at this
driver, not doing all required stuff to change video standard.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 8fcef790fc12fba98ec551c3c78ee96dc1e7ba53..a1be1e279df42e7f90699bcbb9b2a10655995fea 100644 (file)
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1233,7 +1233,7 @@ static struct video_device cx8802_mpeg_template =
        .vidioc_s_tuner       = vidioc_s_tuner,
        .vidioc_s_std         = vidioc_s_std,
        .tvnorms              = CX88_NORMS,
-       .current_norm         = V4L2_STD_PAL_BG,
+       .current_norm         = V4L2_STD_NTSC_M,
 };
 
 /* ------------------------------------------------------------------ */

diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index d388a42b5fbc3b63cbacbbea5f6a129271a0660e..360046e1d6be92bea764d63a36a5d674fa07f8c2 100644 (file)
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -1657,7 +1657,7 @@ static struct video_device cx8800_video_template =
        .vidioc_g_frequency   = vidioc_g_frequency,
        .vidioc_s_frequency   = vidioc_s_frequency,
        .tvnorms              = CX88_NORMS,
-       .current_norm         = V4L2_STD_PAL_BG,
+       .current_norm         = V4L2_STD_NTSC_M,
 };
 
 static const struct file_operations radio_fops =