diff options
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-dvb.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-dvb.c | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c index 662a45c10..685297a9f 100644 --- a/linux/drivers/media/video/saa7134/saa7134-dvb.c +++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-dvb.c,v 1.1 2004/10/19 16:02:05 kraxel Exp $ + * $Id: saa7134-dvb.c,v 1.2 2004/10/20 17:44:24 kraxel Exp $ * * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs] * @@ -37,8 +37,6 @@ MODULE_LICENSE("GPL"); static int dvb_init(struct saa7134_dev *dev) { - int err; - printk("%s: %s\n",dev->name,__FUNCTION__); videobuf_queue_init(&dev->dvb.dvbq, &saa7134_ts_qops, @@ -52,36 +50,18 @@ static int dvb_init(struct saa7134_dev *dev) dev->dvb.priv = dev; dev->dvb.name = dev->name; - /* register adapter */ - err = dvb_register_adapter(&dev->dvb.adapter, dev->name, - THIS_MODULE); - if (err < 0) { - printk(KERN_WARNING "%s: dvb_register_adapter failed (errno = %d)\n", - dev->name, err); - goto fail1; - } - /* TODO: init + register frontend */ + if (NULL == dev->dvb.frontend) + return -1; /* register everything else */ - err = videobuf_dvb_register(&dev->dvb); - if (0 != err) - goto fail2; - return 0; - -fail2: - dvb_unregister_adapter(dev->dvb.adapter); -fail1: - return err; + return videobuf_dvb_register(&dev->dvb); } static int dvb_fini(struct saa7134_dev *dev) { printk("%s: %s\n",dev->name,__FUNCTION__); - videobuf_dvb_unregister(&dev->dvb); - /* TODO: unregister frontend */ - dvb_unregister_adapter(dev->dvb.adapter); return 0; } |