git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
drivers
/
media
/
video
/
video-buf-dvb.c
diff --git
a/drivers/media/video/video-buf-dvb.c
b/drivers/media/video/video-buf-dvb.c
index
31cc4ed
..
5f87007
100644
(file)
--- a/
drivers/media/video/video-buf-dvb.c
+++ b/
drivers/media/video/video-buf-dvb.c
@@
-149,10
+149,10
@@
int videobuf_dvb_register(struct videobuf_dvb *dvb,
dvb->name, result);
goto fail_adapter;
}
dvb->name, result);
goto fail_adapter;
}
- dvb->adapter
->
priv = adapter_priv;
+ dvb->adapter
.
priv = adapter_priv;
/* register frontend */
/* 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);
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;
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);
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 */
}
/* 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:
return 0;
fail_fe_conn:
@@
-223,7
+223,7
@@
fail_dmxdev:
fail_dmx:
dvb_unregister_frontend(dvb->frontend);
fail_frontend:
fail_dmx:
dvb_unregister_frontend(dvb->frontend);
fail_frontend:
- dvb_unregister_adapter(dvb->adapter);
+ dvb_unregister_adapter(
&
dvb->adapter);
fail_adapter:
return result;
}
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_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);
}
EXPORT_SYMBOL(videobuf_dvb_register);