summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/video-buf-dvb.c
diff options
context:
space:
mode:
authorGerd Knorr <devnull@localhost>2004-12-09 12:51:35 +0000
committerGerd Knorr <devnull@localhost>2004-12-09 12:51:35 +0000
commit17d7470d78bd886cab06e6f0848bac4ac8edf1db (patch)
tree2e681fb9a605d3e2ba2feb0007aec272c8833431 /linux/drivers/media/video/video-buf-dvb.c
parent39aa684c82354e2c6c357eed2fd37c38f29c461f (diff)
downloadmediapointer-dvb-s2-17d7470d78bd886cab06e6f0848bac4ac8edf1db.tar.gz
mediapointer-dvb-s2-17d7470d78bd886cab06e6f0848bac4ac8edf1db.tar.bz2
- work on dvb pll stuff.
- misc dvb updates. - pinnacle 300i stuff (not working yet).
Diffstat (limited to 'linux/drivers/media/video/video-buf-dvb.c')
-rw-r--r--linux/drivers/media/video/video-buf-dvb.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/linux/drivers/media/video/video-buf-dvb.c b/linux/drivers/media/video/video-buf-dvb.c
index 175a17271..31cc4ed9b 100644
--- a/linux/drivers/media/video/video-buf-dvb.c
+++ b/linux/drivers/media/video/video-buf-dvb.c
@@ -1,5 +1,5 @@
/*
- * $Id: video-buf-dvb.c,v 1.6 2004/11/18 14:05:57 kraxel Exp $
+ * $Id: video-buf-dvb.c,v 1.7 2004/12/09 12:51:35 kraxel Exp $
*
* some helper function for simple DVB cards which simply DMA the
* complete transport stream and let the computer sort everything else
@@ -134,19 +134,22 @@ static int videobuf_dvb_stop_feed(struct dvb_demux_feed *feed)
/* ------------------------------------------------------------------ */
-int videobuf_dvb_register(struct videobuf_dvb *dvb)
+int videobuf_dvb_register(struct videobuf_dvb *dvb,
+ struct module *module,
+ void *adapter_priv)
{
int result;
init_MUTEX(&dvb->lock);
/* register adapter */
- result = dvb_register_adapter(&dvb->adapter, dvb->name, THIS_MODULE);
+ result = dvb_register_adapter(&dvb->adapter, dvb->name, module);
if (result < 0) {
printk(KERN_WARNING "%s: dvb_register_adapter failed (errno = %d)\n",
dvb->name, result);
goto fail_adapter;
}
+ dvb->adapter->priv = adapter_priv;
/* register frontend */
result = dvb_register_frontend(dvb->adapter, dvb->frontend);