From 865804dbd41218b83ec00330e19a906c80d7ffc2 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 20 Jul 2007 06:26:34 -0300 Subject: [PATCH] --- yaml --- r: 65661 b: refs/heads/master c: baa05e4b454fa7d87f9a41a4bbc1f749c113ff3a h: refs/heads/master i: 65659: 2fb368f10f199df928a63b67c4d1549d05f8a607 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/ivtv/ivtv-driver.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 606016ad270f..240ec572e56f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5e90862114124d79e1a3f34641b00fec51d1806 +refs/heads/master: baa05e4b454fa7d87f9a41a4bbc1f749c113ff3a diff --git a/trunk/drivers/media/video/ivtv/ivtv-driver.c b/trunk/drivers/media/video/ivtv/ivtv-driver.c index d73d433a4ff6..622af634104e 100644 --- a/trunk/drivers/media/video/ivtv/ivtv-driver.c +++ b/trunk/drivers/media/video/ivtv/ivtv-driver.c @@ -1154,8 +1154,13 @@ static int __devinit ivtv_probe(struct pci_dev *dev, vf.tuner = 0; vf.type = V4L2_TUNER_ANALOG_TV; vf.frequency = 6400; /* the tuner 'baseline' frequency */ - if (itv->std & V4L2_STD_NTSC_M) { - /* Why on earth? */ + + /* Set initial frequency. For PAL/SECAM broadcasts no + 'default' channel exists AFAIK. */ + if (itv->std == V4L2_STD_NTSC_M_JP) { + vf.frequency = 1460; /* ch. 1 91250*16/1000 */ + } + else if (itv->std & V4L2_STD_NTSC_M) { vf.frequency = 1076; /* ch. 4 67250*16/1000 */ }