aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/ivtv/ivtv-driver.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/pci/ivtv/ivtv-driver.c')
-rw-r--r--drivers/media/pci/ivtv/ivtv-driver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
index 2928e7287da8..07b8460953b6 100644
--- a/drivers/media/pci/ivtv/ivtv-driver.c
+++ b/drivers/media/pci/ivtv/ivtv-driver.c
@@ -1387,7 +1387,7 @@ int ivtv_init_on_first_open(struct ivtv *itv)
1387 if (!itv->has_cx23415) 1387 if (!itv->has_cx23415)
1388 write_reg_sync(0x03, IVTV_REG_DMACONTROL); 1388 write_reg_sync(0x03, IVTV_REG_DMACONTROL);
1389 1389
1390 ivtv_s_std_enc(itv, &itv->tuner_std); 1390 ivtv_s_std_enc(itv, itv->tuner_std);
1391 1391
1392 /* Default interrupts enabled. For the PVR350 this includes the 1392 /* Default interrupts enabled. For the PVR350 this includes the
1393 decoder VSYNC interrupt, which is always on. It is not only used 1393 decoder VSYNC interrupt, which is always on. It is not only used
@@ -1397,7 +1397,7 @@ int ivtv_init_on_first_open(struct ivtv *itv)
1397 if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) { 1397 if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) {
1398 ivtv_clear_irq_mask(itv, IVTV_IRQ_MASK_INIT | IVTV_IRQ_DEC_VSYNC); 1398 ivtv_clear_irq_mask(itv, IVTV_IRQ_MASK_INIT | IVTV_IRQ_DEC_VSYNC);
1399 ivtv_set_osd_alpha(itv); 1399 ivtv_set_osd_alpha(itv);
1400 ivtv_s_std_dec(itv, &itv->tuner_std); 1400 ivtv_s_std_dec(itv, itv->tuner_std);
1401 } else { 1401 } else {
1402 ivtv_clear_irq_mask(itv, IVTV_IRQ_MASK_INIT); 1402 ivtv_clear_irq_mask(itv, IVTV_IRQ_MASK_INIT);
1403 } 1403 }