---

yaml --- r: 65661 b: refs/heads/master c: baa05e4 h: refs/heads/master i: 65659: 2fb368f v: v3
git-mirror · Oct 10, 2007 · 865804d · 865804d
1 parent 6bce392
commit 865804d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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 */
 	}