---

yaml --- r: 115621 b: refs/heads/master c: f972e0b h: refs/heads/master i: 115619: 5ab5c92 v: v3
git-mirror · Oct 17, 2008 · 75d2371 · 75d2371
1 parent 45438d6
commit 75d2371
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92abe9ee374599179033f039b095864a9cf74593
+refs/heads/master: f972e0bd9361594071d3e68e2342c53b51a1d42b
diff --git a/trunk/drivers/media/video/cx23885/cx23885-dvb.c b/trunk/drivers/media/video/cx23885/cx23885-dvb.c
@@ -314,6 +314,19 @@ static int dvb_register(struct cx23885_tsport *port)
 	struct cx23885_i2c *i2c_bus = NULL;
 	struct videobuf_dvb_frontend *fe0;
 
+	/* FIXME: add support for multi-frontend */
+	mutex_init(&port->frontends.lock);
+	INIT_LIST_HEAD(&port->frontends.frontend.felist);
+	port->frontends.active_fe_id = 0;
+
+	printk(KERN_INFO "%s() allocating 1 frontend\n", __func__);
+
+	if (videobuf_dvb_alloc_frontend(dev, &port->frontends, 1) == NULL) {
+		printk(KERN_ERR "%s() failed to alloc\n", __func__);
+		return -ENOMEM;
+	}
+
+	/* Get the first frontend */
 	fe0 = videobuf_dvb_get_frontend(&port->frontends, 1);
 	if (!fe0)
 		return -EINVAL;

diff --git a/trunk/drivers/media/video/saa7134/saa7134-dvb.c b/trunk/drivers/media/video/saa7134/saa7134-dvb.c
@@ -951,6 +951,18 @@ static int dvb_init(struct saa7134_dev *dev)
 	int attach_xc3028 = 0;
 	struct videobuf_dvb_frontend *fe0;
 
+	/* FIXME: add support for multi-frontend */
+	mutex_init(&dev->frontends.lock);
+	INIT_LIST_HEAD(&dev->frontends.frontend.felist);
+	dev->frontends.active_fe_id = 0;
+
+	printk(KERN_INFO "%s() allocating 1 frontend\n", __func__);
+
+	if (videobuf_dvb_alloc_frontend(dev, &dev->frontends, 1) == NULL) {
+		printk(KERN_ERR "%s() failed to alloc\n", __func__);
+		return -ENOMEM;
+	}
+
 	/* Get the first frontend */
 	fe0 = videobuf_dvb_get_frontend(&dev->frontends, 1);
 	if (!fe0)