aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx18/cx18-driver.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/cx18/cx18-driver.c')
-rw-r--r--drivers/media/video/cx18/cx18-driver.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index fcc40bf37f2..f3b0c946d45 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -884,13 +884,11 @@ static int __devinit cx18_probe(struct pci_dev *pci_dev,
884 884
885 cx18_init_subdevs(cx); 885 cx18_init_subdevs(cx);
886 886
887 if (cx->std & V4L2_STD_525_60) { 887 if (cx->std & V4L2_STD_525_60)
888 cx->is_60hz = 1; 888 cx->is_60hz = 1;
889 cx->is_out_60hz = 1; 889 else
890 } else {
891 cx->is_50hz = 1; 890 cx->is_50hz = 1;
892 cx->is_out_50hz = 1; 891
893 }
894 cx->params.video_gop_size = cx->is_60hz ? 15 : 12; 892 cx->params.video_gop_size = cx->is_60hz ? 15 : 12;
895 893
896 if (cx->options.radio > 0) 894 if (cx->options.radio > 0)