aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/cx88/cx88-core.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index 278d2df77cdb..a51a3b76b1c8 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -899,6 +899,9 @@ int cx88_set_tvnorm(struct cx88_core *core, struct v4l2_tvnorm *norm)
899 if (norm->id & V4L2_STD_NTSC_M_JP) { 899 if (norm->id & V4L2_STD_NTSC_M_JP) {
900 cxiformat = VideoFormatNTSCJapan; 900 cxiformat = VideoFormatNTSCJapan;
901 cxoformat = 0x181f0008; 901 cxoformat = 0x181f0008;
902 } else if (norm->id & V4L2_STD_NTSC_443) {
903 cxiformat = VideoFormatNTSC443;
904 cxoformat = 0x181f0008;
902 } else if (norm->id & V4L2_STD_PAL_M) { 905 } else if (norm->id & V4L2_STD_PAL_M) {
903 cxiformat = VideoFormatPALM; 906 cxiformat = VideoFormatPALM;
904 cxoformat = 0x1c1f0008; 907 cxoformat = 0x1c1f0008;
@@ -915,10 +918,11 @@ int cx88_set_tvnorm(struct cx88_core *core, struct v4l2_tvnorm *norm)
915 cxiformat = VideoFormatNTSC; 918 cxiformat = VideoFormatNTSC;
916 cxoformat = 0x181f0008; 919 cxoformat = 0x181f0008;
917 } else if (norm->id & V4L2_STD_SECAM) { 920 } else if (norm->id & V4L2_STD_SECAM) {
918 cxiformat = VideoFormatSECAM;
919 cxoformat = 0x181f0008;
920 step_db = 4250000 * 8; 921 step_db = 4250000 * 8;
921 step_dr = 4406250 * 8; 922 step_dr = 4406250 * 8;
923
924 cxiformat = VideoFormatSECAM;
925 cxoformat = 0x181f0008;
922 } else { /* PAL */ 926 } else { /* PAL */
923 cxiformat = VideoFormatPAL; 927 cxiformat = VideoFormatPAL;
924 cxoformat = 0x181f0008; 928 cxoformat = 0x181f0008;