Commit 3421b778 authored by Aidan Thornton's avatar Aidan Thornton Committed by Mauro Carvalho Chehab

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: default avatarAidan Thornton <makosoft@googlemail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 579f72e4
This diff is collapsed.
...@@ -2190,11 +2190,6 @@ static int em28xx_usb_probe(struct usb_interface *interface, ...@@ -2190,11 +2190,6 @@ static int em28xx_usb_probe(struct usb_interface *interface,
/* save our data pointer in this interface device */ /* save our data pointer in this interface device */
usb_set_intfdata(interface, dev); usb_set_intfdata(interface, dev);
#if defined(CONFIG_VIDEO_EM28XX_DVB) || defined(CONFIG_VIDEO_EM28XX_DVB_MODULE)
dev->qops = kmalloc(sizeof(em28xx_video_qops), GFP_KERNEL);
memcpy(dev->qops, &em28xx_video_qops, sizeof(em28xx_video_qops));
#endif
request_modules(dev); request_modules(dev);
return 0; return 0;
......
...@@ -422,11 +422,7 @@ struct em28xx { ...@@ -422,11 +422,7 @@ struct em28xx {
enum em28xx_mode mode; enum em28xx_mode mode;
#if defined(CONFIG_VIDEO_EM28XX_DVB) || defined(CONFIG_VIDEO_EM28XX_DVB_MODULE) struct em28xx_dvb *dvb;
struct videobuf_dvb dvb;
struct videobuf_queue_ops *qops;
struct em28xx_fh dvb_fh;
#endif
}; };
struct em28xx_ops { struct em28xx_ops {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment