diff options
| author | Nickolay V. Shmyrev <devnull@localhost> | 2005-05-22 19:23:39 +0000 |
|---|---|---|
| committer | Nickolay V. Shmyrev <devnull@localhost> | 2005-05-22 19:23:39 +0000 |
| commit | c3aa185f55fdc149f5491cd71c1e76b49f56ecd4 (patch) | |
| tree | 628cb2361cc2bf750efb58e3a2a8e86fd57b2f12 /linux/drivers/media/video/cx88/cx88-dvb.c | |
| parent | 2d72b576e164cae31abae406649d52af1e2bd340 (diff) | |
| download | mediapointer-dvb-s2-c3aa185f55fdc149f5491cd71c1e76b49f56ecd4.tar.gz mediapointer-dvb-s2-c3aa185f55fdc149f5491cd71c1e76b49f56ecd4.tar.bz2 | |
Large changes. Mostly merged patches from mm kernel branch and 2.6.12-rc4.
Update entries for Lifiview Platinum FM and Avermedia cards
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-dvb.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-dvb.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c index 227bf1334..02b33a6a9 100644 --- a/linux/drivers/media/video/cx88/cx88-dvb.c +++ b/linux/drivers/media/video/cx88/cx88-dvb.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-dvb.c,v 1.31 2005/03/07 15:58:05 kraxel Exp $ + * $Id: cx88-dvb.c,v 1.32 2005/05/22 19:23:39 nsh Exp $ * * device driver for Conexant 2388x based TV cards * MPEG Transport Stream (DVB) routines @@ -191,7 +191,7 @@ static int or51132_set_ts_param(struct dvb_frontend* fe, return 0; } -struct or51132_config pchdtv_hd3000 = { +static struct or51132_config pchdtv_hd3000 = { .demod_address = 0x15, .pll_address = 0x61, .pll_desc = &dvb_pll_thomson_dtt7610, @@ -243,10 +243,8 @@ static int dvb_register(struct cx8802_dev *dev) break; #endif default: - printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n" - "%s: you might want to look out for patches here:\n" - "%s: http://dl.bytesex.org/patches/\n", - dev->core->name, dev->core->name, dev->core->name); + printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n", + dev->core->name); break; } if (NULL == dev->dvb.frontend) { @@ -308,9 +306,11 @@ static int __devinit dvb_probe(struct pci_dev *pci_dev, dev); err = dvb_register(dev); if (0 != err) - goto fail_free; + goto fail_fini; return 0; + fail_fini: + cx8802_fini_common(dev); fail_free: kfree(dev); fail_core: |