1 files changed, 24 insertions, 3 deletions

diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 06644e230b47..9f79c39349fb 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -86,6 +86,23 @@ static struct em2820_tvnorm tvnorms[] = {
         }
 };
 
+static const unsigned char saa7114_i2c_init[] = {
+        0x00,0x00,0x01,0x08,0x02,0xc4,0x03,0x30,0x04,0x90,0x05,0x90,0x06,0xeb,0x07,0xe0,
+        0x08,0x88,0x09,0x40,0x0a,0x80,0x0b,0x44,0x0c,0x40,0x0d,0x00,0x0e,0x81,0x0f,0x2a,
+        0x10,0x06,0x11,0x00,0x12,0xc8,0x13,0x80,0x14,0x00,0x15,0x11,0x16,0x01,0x17,0x42,
+        0x18,0x40,0x19,0x80,0x40,0x00,0x41,0xff,0x42,0xff,0x43,0xff,0x44,0xff,0x45,0xff,
+        0x46,0xff,0x47,0xff,0x48,0xff,0x49,0xff,0x4a,0xff,0x4b,0xff,0x4c,0xff,0x4d,0xff,
+        0x4e,0xff,0x4f,0xff,0x50,0xff,0x51,0xff,0x52,0xff,0x53,0xff,0x54,0x5f,0x55,0xff,
+        0x56,0xff,0x57,0xff,0x58,0x00,0x59,0x47,0x5a,0x03,0x5b,0x03,0x5d,0x3e,0x5e,0x00,
+        0x80,0x1c,0x83,0x01,0x84,0xa5,0x85,0x10,0x86,0x45,0x87,0x41,0x88,0xf0,0x88,0x00,
+        0x88,0xf0,0x90,0x00,0x91,0x08,0x92,0x00,0x93,0x80,0x94,0x08,0x95,0x00,0x96,0xc0,
+        0x97,0x02,0x98,0x13,0x99,0x00,0x9a,0x38,0x9b,0x01,0x9c,0x80,0x9d,0x02,0x9e,0x06,
+        0x9f,0x01,0xa0,0x01,0xa1,0x00,0xa2,0x00,0xa4,0x80,0xa5,0x36,0xa6,0x36,0xa8,0x67,
+        0xa9,0x04,0xaa,0x00,0xac,0x33,0xad,0x02,0xae,0x00,0xb0,0xcd,0xb1,0x04,0xb2,0xcd,
+        0xb3,0x04,0xb4,0x01,0xb8,0x00,0xb9,0x00,0xba,0x00,0xbb,0x00,0xbc,0x00,0xbd,0x00,
+        0xbe,0x00,0xbf,0x00
+};
+
 #define TVNORMS ARRAY_SIZE(tvnorms)
 
 /* supported controls */
@@ -216,6 +233,12 @@ void em2820_config_i2c(struct em2820 *dev)
 
 
         /* configure decoder */
+        if(dev->model == EM2820_BOARD_MSI_VOX_USB_2){
+                em2820_vdi.data=saa7114_i2c_init;
+                em2820_vdi.len=sizeof(saa7114_i2c_init);
+        }
+
+
         em2820_i2c_call_clients(dev, DECODER_INIT, &em2820_vdi);
         em2820_i2c_call_clients(dev, DECODER_SET_INPUT, &dev->ctl_input);
 /*      em2820_i2c_call_clients(dev,DECODER_SET_PICTURE, &dev->vpic); */
@@ -1627,10 +1650,8 @@ static int em2820_init_dev(struct em2820 **devhandle, struct usb_device *udev,
 
 #ifdef CONFIG_MODULES
         /* request some modules */
-        if (dev->decoder == EM2820_SAA7113)
+        if (dev->decoder == EM2820_SAA7113 || dev->decoder == EM2820_SAA7114)
                 request_module("saa7113");
-        if (dev->decoder == EM2820_SAA7114)
-                request_module("saa7114");
         if (dev->decoder == EM2820_TVP5150)
                 request_module("tvp5150");
         if (dev->has_tuner)