The patch number 9224 was added via [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Darron Broad <[EMAIL PROTECTED]>
MFE: bugfix: add missing frontend allocation
When using MFE on a setup with both and HVR-3000 and ASUS P7131
card it was noticed that frontend allocation for saa7134
adapters was missing. This patch adds that allocation for
both saa7134 and cx23885 adapters.
Priority: normal
Signed-off-by: Darron Broad <[EMAIL PROTECTED]>
---
linux/drivers/media/video/cx23885/cx23885-dvb.c | 13 +++++++++++++
linux/drivers/media/video/saa7134/saa7134-dvb.c | 12 ++++++++++++
2 files changed, 25 insertions(+)
diff -r b25a2d5f0a6e -r d32af44678e6
linux/drivers/media/video/cx23885/cx23885-dvb.c
--- a/linux/drivers/media/video/cx23885/cx23885-dvb.c Sat Oct 11 15:18:53
2008 +0100
+++ b/linux/drivers/media/video/cx23885/cx23885-dvb.c Sat Oct 11 15:24:30
2008 +0100
@@ -315,6 +315,19 @@ static int dvb_register(struct cx23885_t
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 -r b25a2d5f0a6e -r d32af44678e6
linux/drivers/media/video/saa7134/saa7134-dvb.c
--- a/linux/drivers/media/video/saa7134/saa7134-dvb.c Sat Oct 11 15:18:53
2008 +0100
+++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c Sat Oct 11 15:24:30
2008 +0100
@@ -950,6 +950,18 @@ static int dvb_init(struct saa7134_dev *
int ret;
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);
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/d32af44678e65c9a97b5c56aebe202c3a3d206bb
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
