diff options
author | Aidan Thornton <makosoft@googlemail.com> | 2008-04-17 20:40:36 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:09:41 -0400 |
commit | 3421b7787a2cf41ac5edce9b5766bddd1e1d9986 (patch) | |
tree | 365e77e9c81b6646bb8c865f981c3d12dc37556c /drivers/media/video/em28xx/em28xx-video.c | |
parent | 579f72e44fb1c991352f44c20b471c3001357f68 (diff) |
V4L/DVB (7603): em28xx-dvb: don't use videobuf-dvb
Modifies em28xx-dvb not to use videobuf-dvb, but instead to include the code
for registering dvb devices locally and use the URB management code in the
em28xx driver directly. DVB data streaming should now work.
Signed-off-by: Aidan Thornton <makosoft@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-video.c')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-video.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index 1a0b09714af5..ffbc91f2ecbd 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
@@ -2190,11 +2190,6 @@ static int em28xx_usb_probe(struct usb_interface *interface, | |||
2190 | /* save our data pointer in this interface device */ | 2190 | /* save our data pointer in this interface device */ |
2191 | usb_set_intfdata(interface, dev); | 2191 | usb_set_intfdata(interface, dev); |
2192 | 2192 | ||
2193 | #if defined(CONFIG_VIDEO_EM28XX_DVB) || defined(CONFIG_VIDEO_EM28XX_DVB_MODULE) | ||
2194 | dev->qops = kmalloc(sizeof(em28xx_video_qops), GFP_KERNEL); | ||
2195 | memcpy(dev->qops, &em28xx_video_qops, sizeof(em28xx_video_qops)); | ||
2196 | #endif | ||
2197 | |||
2198 | request_modules(dev); | 2193 | request_modules(dev); |
2199 | 2194 | ||
2200 | return 0; | 2195 | return 0; |