1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 6084f8452b2b..362251838d4b 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -63,10 +63,6 @@ MODULE_PARM_DESC(isoc_debug, "enable debug messages [isoc transfers]");
                 printk(KERN_INFO "%s %s :"fmt, \
                          dev->name, __func__ , ##arg); } while (0)
 
-/* Limits minimum and default number of buffers */
-#define EM28XX_MIN_BUF 4
-#define EM28XX_DEF_BUF 8
-
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
@@ -2237,6 +2233,9 @@ static void request_module_async(struct work_struct *work)
                 request_module("snd-usb-audio");
         else
                 request_module("em28xx-alsa");
+
+        if (dev->has_dvb)
+                request_module("em28xx-dvb");
 }
 
 static void request_modules(struct em28xx *dev)
@@ -2368,6 +2367,11 @@ static int em28xx_usb_probe(struct usb_interface *interface,
         /* save our data pointer in this interface device */
         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);
 
         return 0;