aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-01-20 11:59:41 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 10:34:46 -0500
commita4b662f736c7919207da113814c35cad340c67fd (patch)
treeda061551855d8a023fa841bf6aac06f123f3bf1c
parentb3c4ee7016ad9d4c51887591b8a62c05f59cc498 (diff)
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>
-rw-r--r--drivers/media/video/cx88/cx88-blackbird.c2
-rw-r--r--drivers/media/video/cx88/cx88-video.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 8fcef790fc12..a1be1e279df4 100644
--- 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 =
1233 .vidioc_s_tuner = vidioc_s_tuner, 1233 .vidioc_s_tuner = vidioc_s_tuner,
1234 .vidioc_s_std = vidioc_s_std, 1234 .vidioc_s_std = vidioc_s_std,
1235 .tvnorms = CX88_NORMS, 1235 .tvnorms = CX88_NORMS,
1236 .current_norm = V4L2_STD_PAL_BG, 1236 .current_norm = V4L2_STD_NTSC_M,
1237}; 1237};
1238 1238
1239/* ------------------------------------------------------------------ */ 1239/* ------------------------------------------------------------------ */
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index d388a42b5fbc..360046e1d6be 100644
--- 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 =
1657 .vidioc_g_frequency = vidioc_g_frequency, 1657 .vidioc_g_frequency = vidioc_g_frequency,
1658 .vidioc_s_frequency = vidioc_s_frequency, 1658 .vidioc_s_frequency = vidioc_s_frequency,
1659 .tvnorms = CX88_NORMS, 1659 .tvnorms = CX88_NORMS,
1660 .current_norm = V4L2_STD_PAL_BG, 1660 .current_norm = V4L2_STD_NTSC_M,
1661}; 1661};
1662 1662
1663static const struct file_operations radio_fops = 1663static const struct file_operations radio_fops =