diff options
| author | Hartmut Hackmann <devnull@localhost> | 2005-06-14 22:53:55 +0000 |
|---|---|---|
| committer | Hartmut Hackmann <devnull@localhost> | 2005-06-14 22:53:55 +0000 |
| commit | af74d596da3ed54a6afa537a599f89570ba5728e (patch) | |
| tree | fb5dde3189c098e2e5b0227a6ccd14ded771b827 | |
| parent | d44964477849d2a073e709e7b48a43225f1b7dda (diff) | |
| download | mediapointer-dvb-s2-af74d596da3ed54a6afa537a599f89570ba5728e.tar.gz mediapointer-dvb-s2-af74d596da3ed54a6afa537a599f89570ba5728e.tar.bz2 | |
- adapt to dvb core change in 2.6.12-rc4
Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
| -rw-r--r-- | linux/drivers/media/video/video-buf-dvb.c | 14 | ||||
| -rw-r--r-- | linux/include/media/video-buf-dvb.h | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/linux/drivers/media/video/video-buf-dvb.c b/linux/drivers/media/video/video-buf-dvb.c index 31cc4ed9b..cd48516a9 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.7 2004/12/09 12:51:35 kraxel Exp $ + * $Id: video-buf-dvb.c,v 1.8 2005/06/14 22:53:55 hhackmann Exp $ * * some helper function for simple DVB cards which simply DMA the * complete transport stream and let the computer sort everything else @@ -149,10 +149,10 @@ int videobuf_dvb_register(struct videobuf_dvb *dvb, dvb->name, result); goto fail_adapter; } - dvb->adapter->priv = adapter_priv; + dvb->adapter.priv = adapter_priv; /* register frontend */ - result = dvb_register_frontend(dvb->adapter, dvb->frontend); + result = dvb_register_frontend(&dvb->adapter, dvb->frontend); if (result < 0) { printk(KERN_WARNING "%s: dvb_register_frontend failed (errno = %d)\n", dvb->name, result); @@ -178,7 +178,7 @@ int videobuf_dvb_register(struct videobuf_dvb *dvb, dvb->dmxdev.filternum = 256; dvb->dmxdev.demux = &dvb->demux.dmx; dvb->dmxdev.capabilities = 0; - result = dvb_dmxdev_init(&dvb->dmxdev, dvb->adapter); + result = dvb_dmxdev_init(&dvb->dmxdev, &dvb->adapter); if (result < 0) { printk(KERN_WARNING "%s: dvb_dmxdev_init failed (errno = %d)\n", dvb->name, result); @@ -209,7 +209,7 @@ int videobuf_dvb_register(struct videobuf_dvb *dvb, } /* register network adapter */ - dvb_net_init(dvb->adapter, &dvb->net, &dvb->demux.dmx); + dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx); return 0; fail_fe_conn: @@ -223,7 +223,7 @@ fail_dmxdev: fail_dmx: dvb_unregister_frontend(dvb->frontend); fail_frontend: - dvb_unregister_adapter(dvb->adapter); + dvb_unregister_adapter(&dvb->adapter); fail_adapter: return result; } @@ -236,7 +236,7 @@ void videobuf_dvb_unregister(struct videobuf_dvb *dvb) dvb_dmxdev_release(&dvb->dmxdev); dvb_dmx_release(&dvb->demux); dvb_unregister_frontend(dvb->frontend); - dvb_unregister_adapter(dvb->adapter); + dvb_unregister_adapter(&dvb->adapter); } EXPORT_SYMBOL(videobuf_dvb_register); diff --git a/linux/include/media/video-buf-dvb.h b/linux/include/media/video-buf-dvb.h index cd636be00..865836f50 100644 --- a/linux/include/media/video-buf-dvb.h +++ b/linux/include/media/video-buf-dvb.h @@ -1,5 +1,5 @@ /* - * $Id: video-buf-dvb.h,v 1.5 2005/06/12 04:19:19 mchehab Exp $ + * $Id: video-buf-dvb.h,v 1.6 2005/06/14 22:53:55 hhackmann Exp $ */ #include <dvbdev.h> @@ -20,7 +20,7 @@ struct videobuf_dvb { int nfeeds; /* videobuf_dvb_(un)register manges this */ - struct dvb_adapter *adapter; + struct dvb_adapter adapter; struct dvb_demux demux; struct dmxdev dmxdev; struct dmx_frontend fe_hw; |