diff options
| author | darron@kewl.org <darron@kewl.org> | 2008-10-21 14:43:10 +0100 |
|---|---|---|
| committer | darron@kewl.org <darron@kewl.org> | 2008-10-21 14:43:10 +0100 |
| commit | 2cfa489837712ce5e1f65039f8a9827907220aa5 (patch) | |
| tree | 5fb2c700123abe27f1037f093b7c920e36f1a101 /linux/drivers | |
| parent | 102df888ee48727bf1593559f4c301f33ecd7bab (diff) | |
| download | mediapointer-dvb-s2-2cfa489837712ce5e1f65039f8a9827907220aa5.tar.gz mediapointer-dvb-s2-2cfa489837712ce5e1f65039f8a9827907220aa5.tar.bz2 | |
cx88: Not all boards that requires cx88-mpeg has frontends
From: Mauro Carvalho Chehab <mchehab@infradead.org>
The multifrontend changes on cx88 assumed that all boards that use cx88-mpeg
supports DVB. This is not true. There also a few analog-only boards based on
Blackboard design that also uses cx88-mpeg. For those boards, there's no need
to allocate dvb frontends.
This patch fixes videobuf allocation for those devices.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-mpeg.c | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 1a79387c0..4897c852d 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -3077,8 +3077,8 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr) memcpy(&core->board, &cx88_boards[core->boardnr], sizeof(core->board)); - if (!core->board.num_frontends) - core->board.num_frontends=1; + if (!core->board.num_frontends && (core->board.mpeg & CX88_MPEG_DVB)) + core->board.num_frontends = 1; info_printk(core, "subsystem: %04x:%04x, board: %s [card=%d,%s], frontend(s): %d\n", pci->subsystem_vendor, pci->subsystem_device, core->board.name, diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c index 0c33ebdd6..b21b0c26c 100644 --- a/linux/drivers/media/video/cx88/cx88-mpeg.c +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c @@ -825,11 +825,6 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev, if (!core->board.mpeg) goto fail_core; - if (!core->board.num_frontends) { - printk(KERN_ERR "%s() .num_frontends should be non-zero, err = %d\n", __func__, err); - goto fail_core; - } - err = -ENOMEM; dev = kzalloc(sizeof(*dev),GFP_KERNEL); if (NULL == dev) @@ -848,7 +843,8 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev, mutex_init(&dev->frontends.lock); INIT_LIST_HEAD(&dev->frontends.felist); - printk(KERN_INFO "%s() allocating %d frontend(s)\n", __func__, core->board.num_frontends); + if (core->board.num_frontends) + printk(KERN_INFO "%s() allocating %d frontend(s)\n", __func__, core->board.num_frontends); for (i = 1; i <= core->board.num_frontends; i++) { demod = videobuf_dvb_alloc_frontend(&dev->frontends, i); |