diff options
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/cx88/cx88-dvb.c | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-dvb.c | 2 | ||||
-rw-r--r-- | drivers/media/video/video-buf-dvb.c | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c index 5c05e09e73fa..28e0d3d94515 100644 --- a/drivers/media/video/cx88/cx88-dvb.c +++ b/drivers/media/video/cx88/cx88-dvb.c | |||
@@ -722,7 +722,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
722 | cx88_call_i2c_clients (dev->core, TUNER_SET_STANDBY, NULL); | 722 | cx88_call_i2c_clients (dev->core, TUNER_SET_STANDBY, NULL); |
723 | 723 | ||
724 | /* register everything */ | 724 | /* register everything */ |
725 | return videobuf_dvb_register(&dev->dvb, THIS_MODULE, dev); | 725 | return videobuf_dvb_register(&dev->dvb, THIS_MODULE, dev, &dev->pci->dev); |
726 | } | 726 | } |
727 | 727 | ||
728 | /* ----------------------------------------------------------- */ | 728 | /* ----------------------------------------------------------- */ |
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c index 222a36c38917..98a492ddc216 100644 --- a/drivers/media/video/saa7134/saa7134-dvb.c +++ b/drivers/media/video/saa7134/saa7134-dvb.c | |||
@@ -1088,7 +1088,7 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1088 | } | 1088 | } |
1089 | 1089 | ||
1090 | /* register everything else */ | 1090 | /* register everything else */ |
1091 | return videobuf_dvb_register(&dev->dvb, THIS_MODULE, dev); | 1091 | return videobuf_dvb_register(&dev->dvb, THIS_MODULE, dev, &dev->pci->dev); |
1092 | } | 1092 | } |
1093 | 1093 | ||
1094 | static int dvb_fini(struct saa7134_dev *dev) | 1094 | static int dvb_fini(struct saa7134_dev *dev) |
diff --git a/drivers/media/video/video-buf-dvb.c b/drivers/media/video/video-buf-dvb.c index caf3e7e2f219..7ee8a53cd336 100644 --- a/drivers/media/video/video-buf-dvb.c +++ b/drivers/media/video/video-buf-dvb.c | |||
@@ -135,14 +135,15 @@ static int videobuf_dvb_stop_feed(struct dvb_demux_feed *feed) | |||
135 | 135 | ||
136 | int videobuf_dvb_register(struct videobuf_dvb *dvb, | 136 | int videobuf_dvb_register(struct videobuf_dvb *dvb, |
137 | struct module *module, | 137 | struct module *module, |
138 | void *adapter_priv) | 138 | void *adapter_priv, |
139 | struct device *device) | ||
139 | { | 140 | { |
140 | int result; | 141 | int result; |
141 | 142 | ||
142 | mutex_init(&dvb->lock); | 143 | mutex_init(&dvb->lock); |
143 | 144 | ||
144 | /* register adapter */ | 145 | /* register adapter */ |
145 | result = dvb_register_adapter(&dvb->adapter, dvb->name, module); | 146 | result = dvb_register_adapter(&dvb->adapter, dvb->name, module, device); |
146 | if (result < 0) { | 147 | if (result < 0) { |
147 | printk(KERN_WARNING "%s: dvb_register_adapter failed (errno = %d)\n", | 148 | printk(KERN_WARNING "%s: dvb_register_adapter failed (errno = %d)\n", |
148 | dvb->name, result); | 149 | dvb->name, result); |