Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (534 commits)
  V4L/DVB (13554a): v4l: Use the video_drvdata function in drivers
  V4L/DVB: vivi and mem2mem_testdev need slab.h to build
  V4L/DVB: tm6000: bugfix image position
  V4L/DVB: IR/imon: remove dead IMON_KEY_RELEASE_OFFSET
  V4L/DVB: tm6000: README - add vbi
  V4L/DVB: Fix unlock logic at medusa_video_init
  V4L/DVB: fix dvb frontend lockup
  V4L/DVB: s2255drv: remove dead code
  V4L/DVB: s2255drv: return if vdev not found
  V4L/DVB: ov511: cleanup: remove unneeded null check
  V4L/DVB: media/mem2mem: dereferencing free memory
  V4L/DVB: media/IR: Add missing include file to rc-map.c
  V4L/DVB: dvb/stv6110x: cleanup error handling
  V4L/DVB: ngene: Add lgdt3303 and mt2131 deps to Kconfig
  V4L/DVB: ngene: start separating out DVB functions into separate file
  V4L/DVB: ngene: split out card specific code into a separate file
  V4L/DVB: ngene: split out i2c code into a separate file
  V4L/DVB: ngene: add initial support for digital side of Avermedia m780
  V4L/DVB: ngene: properly support boards where channel 0 isn't a TS input
  V4L-DVB: ngene: make sure that tuner headers are included
  ...

7 files changed, 124 insertions, 72 deletions

diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c
index bd783387b37d..e182abf476c9 100644
--- a/drivers/media/video/em28xx/em28xx-audio.c
+++ b/drivers/media/video/em28xx/em28xx-audio.c
@@ -491,7 +491,7 @@ static int em28xx_audio_init(struct em28xx *dev)
         strcpy(pcm->name, "Empia 28xx Capture");
 
         snd_card_set_dev(card, &dev->udev->dev);
-        strcpy(card->driver, "Empia Em28xx Audio");
+        strcpy(card->driver, "Em28xx-Audio");
         strcpy(card->shortname, "Em28xx Audio");
         strcpy(card->longname, "Empia Em28xx Audio");
 
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index b0fb08337710..3a4fd8514511 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -602,7 +602,7 @@ struct em28xx_board em28xx_boards[] = {
                 .name         = "Gadmei UTV330+",
                 .tuner_type   = TUNER_TNF_5335MF,
                 .tda9887_conf = TDA9887_PRESENT,
-                .ir_codes     = &ir_codes_gadmei_rm008z_table,
+                .ir_codes     = RC_MAP_GADMEI_RM008Z,
                 .decoder      = EM28XX_SAA711X,
                 .xclk         = EM28XX_XCLK_FREQUENCY_12MHZ,
                 .input        = { {
@@ -681,6 +681,20 @@ struct em28xx_board em28xx_boards[] = {
                         .amux     = EM28XX_AMUX_LINE_IN,
                 } },
         },
+        [EM2860_BOARD_TVP5150_REFERENCE_DESIGN] = {
+                .name          = "EM2860/TVP5150 Reference Design",
+                .tuner_type    = TUNER_ABSENT,  /* Capture only device */
+                .decoder       = EM28XX_TVP5150,
+                .input         = { {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = TVP5150_COMPOSITE1,
+                        .amux     = EM28XX_AMUX_LINE_IN,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = TVP5150_SVIDEO,
+                        .amux     = EM28XX_AMUX_LINE_IN,
+                } },
+        },
         [EM2861_BOARD_PLEXTOR_PX_TV100U] = {
                 .name         = "Plextor ConvertX PX-TV100U",
                 .tuner_type   = TUNER_TNF_5335MF,
@@ -777,7 +791,7 @@ struct em28xx_board em28xx_boards[] = {
                 .mts_firmware = 1,
                 .has_dvb      = 1,
                 .dvb_gpio     = hauppauge_wintv_hvr_900_digital,
-                .ir_codes     = &ir_codes_hauppauge_new_table,
+                .ir_codes     = RC_MAP_HAUPPAUGE_NEW,
                 .decoder      = EM28XX_TVP5150,
                 .input        = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -802,7 +816,7 @@ struct em28xx_board em28xx_boards[] = {
                 .tuner_type   = TUNER_XC2028,
                 .tuner_gpio   = default_tuner_gpio,
                 .mts_firmware = 1,
-                .ir_codes     = &ir_codes_hauppauge_new_table,
+                .ir_codes     = RC_MAP_HAUPPAUGE_NEW,
                 .decoder      = EM28XX_TVP5150,
                 .input        = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -828,7 +842,7 @@ struct em28xx_board em28xx_boards[] = {
                 .mts_firmware   = 1,
                 .has_dvb        = 1,
                 .dvb_gpio       = hauppauge_wintv_hvr_900_digital,
-                .ir_codes       = &ir_codes_hauppauge_new_table,
+                .ir_codes       = RC_MAP_HAUPPAUGE_NEW,
                 .decoder        = EM28XX_TVP5150,
                 .input          = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -854,7 +868,7 @@ struct em28xx_board em28xx_boards[] = {
                 .mts_firmware   = 1,
                 .has_dvb        = 1,
                 .dvb_gpio       = hauppauge_wintv_hvr_900_digital,
-                .ir_codes       = &ir_codes_rc5_hauppauge_new_table,
+                .ir_codes       = RC_MAP_RC5_HAUPPAUGE_NEW,
                 .decoder        = EM28XX_TVP5150,
                 .input          = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -880,7 +894,7 @@ struct em28xx_board em28xx_boards[] = {
                 .mts_firmware   = 1,
                 .has_dvb        = 1,
                 .dvb_gpio       = hauppauge_wintv_hvr_900_digital,
-                .ir_codes       = &ir_codes_pinnacle_pctv_hd_table,
+                .ir_codes       = RC_MAP_PINNACLE_PCTV_HD,
                 .decoder        = EM28XX_TVP5150,
                 .input          = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -906,7 +920,7 @@ struct em28xx_board em28xx_boards[] = {
                 .mts_firmware   = 1,
                 .has_dvb        = 1,
                 .dvb_gpio       = hauppauge_wintv_hvr_900_digital,
-                .ir_codes       = &ir_codes_ati_tv_wonder_hd_600_table,
+                .ir_codes       = RC_MAP_ATI_TV_WONDER_HD_600,
                 .decoder        = EM28XX_TVP5150,
                 .input          = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -932,7 +946,7 @@ struct em28xx_board em28xx_boards[] = {
                 .decoder        = EM28XX_TVP5150,
                 .has_dvb        = 1,
                 .dvb_gpio       = default_digital,
-                .ir_codes       = &ir_codes_terratec_cinergy_xs_table,
+                .ir_codes       = RC_MAP_TERRATEC_CINERGY_XS,
                 .xclk           = EM28XX_XCLK_FREQUENCY_12MHZ, /* NEC IR */
                 .input          = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -1282,7 +1296,7 @@ struct em28xx_board em28xx_boards[] = {
                 .decoder        = EM28XX_SAA711X,
                 .has_dvb        = 1,
                 .dvb_gpio       = em2882_kworld_315u_digital,
-                .ir_codes       = &ir_codes_kworld_315u_table,
+                .ir_codes       = RC_MAP_KWORLD_315U,
                 .xclk           = EM28XX_XCLK_FREQUENCY_12MHZ,
                 .i2c_speed      = EM28XX_I2C_CLK_WAIT_ENABLE,
                 /* Analog mode - still not ready */
@@ -1404,10 +1418,14 @@ struct em28xx_board em28xx_boards[] = {
         },
         [EM2882_BOARD_KWORLD_VS_DVBT] = {
                 .name         = "Kworld VS-DVB-T 323UR",
-                .valid        = EM28XX_BOARD_NOT_VALIDATED,
                 .tuner_type   = TUNER_XC2028,
                 .tuner_gpio   = default_tuner_gpio,
                 .decoder      = EM28XX_TVP5150,
+                .mts_firmware = 1,
+                .has_dvb      = 1,
+                .dvb_gpio     = kworld_330u_digital,
+                .xclk         = EM28XX_XCLK_FREQUENCY_12MHZ, /* NEC IR */
+                .ir_codes     = RC_MAP_KWORLD_315U,
                 .input        = { {
                         .type     = EM28XX_VMUX_TELEVISION,
                         .vmux     = TVP5150_COMPOSITE0,
@@ -1430,7 +1448,7 @@ struct em28xx_board em28xx_boards[] = {
                 .decoder      = EM28XX_TVP5150,
                 .has_dvb      = 1,
                 .dvb_gpio     = hauppauge_wintv_hvr_900_digital,
-                .ir_codes     = &ir_codes_terratec_cinergy_xs_table,
+                .ir_codes     = RC_MAP_TERRATEC_CINERGY_XS,
                 .xclk         = EM28XX_XCLK_FREQUENCY_12MHZ,
                 .input        = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -1523,7 +1541,7 @@ struct em28xx_board em28xx_boards[] = {
                 .mts_firmware = 1,
                 .decoder      = EM28XX_TVP5150,
                 .tuner_gpio   = default_tuner_gpio,
-                .ir_codes     = &ir_codes_kaiomy_table,
+                .ir_codes     = RC_MAP_KAIOMY,
                 .input          = { {
                         .type     = EM28XX_VMUX_TELEVISION,
                         .vmux     = TVP5150_COMPOSITE0,
@@ -1623,7 +1641,7 @@ struct em28xx_board em28xx_boards[] = {
                 .mts_firmware = 1,
                 .has_dvb      = 1,
                 .dvb_gpio     = evga_indtube_digital,
-                .ir_codes     = &ir_codes_evga_indtube_table,
+                .ir_codes     = RC_MAP_EVGA_INDTUBE,
                 .input        = { {
                         .type     = EM28XX_VMUX_TELEVISION,
                         .vmux     = TVP5150_COMPOSITE0,
@@ -1672,6 +1690,8 @@ struct usb_device_id em28xx_id_table[] = {
                         .driver_info = EM2820_BOARD_UNKNOWN },
         { USB_DEVICE(0xeb1a, 0x2862),
                         .driver_info = EM2820_BOARD_UNKNOWN },
+        { USB_DEVICE(0xeb1a, 0x2863),
+                        .driver_info = EM2820_BOARD_UNKNOWN },
         { USB_DEVICE(0xeb1a, 0x2870),
                         .driver_info = EM2820_BOARD_UNKNOWN },
         { USB_DEVICE(0xeb1a, 0x2881),
@@ -1792,6 +1812,7 @@ static struct em28xx_hash_table em28xx_i2c_hash[] = {
         {0xb06a32c3, EM2800_BOARD_TERRATEC_CINERGY_200, TUNER_LG_PAL_NEW_TAPC},
         {0xf51200e3, EM2800_BOARD_VGEAR_POCKETTV, TUNER_LG_PAL_NEW_TAPC},
         {0x1ba50080, EM2860_BOARD_SAA711X_REFERENCE_DESIGN, TUNER_ABSENT},
+        {0x77800080, EM2860_BOARD_TVP5150_REFERENCE_DESIGN, TUNER_ABSENT},
         {0xc51200e3, EM2820_BOARD_GADMEI_TVR200, TUNER_LG_PAL_NEW_TAPC},
         {0x4ba50080, EM2861_BOARD_GADMEI_UTV330PLUS, TUNER_TNF_5335MF},
 };
@@ -2138,6 +2159,7 @@ static void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl)
                 break;
         case EM2883_BOARD_KWORLD_HYBRID_330U:
         case EM2882_BOARD_DIKOM_DK300:
+        case EM2882_BOARD_KWORLD_VS_DVBT:
                 ctl->demod = XC3028_FE_CHINA;
                 ctl->fname = XC2028_DEFAULT_FIRMWARE;
                 break;
@@ -2313,21 +2335,21 @@ void em28xx_register_i2c_ir(struct em28xx *dev)
         switch (dev->model) {
         case EM2800_BOARD_TERRATEC_CINERGY_200:
         case EM2820_BOARD_TERRATEC_CINERGY_250:
-                dev->init_data.ir_codes = &ir_codes_em_terratec_table;
+                dev->init_data.ir_codes = RC_MAP_EM_TERRATEC;
                 dev->init_data.get_key = em28xx_get_key_terratec;
                 dev->init_data.name = "i2c IR (EM28XX Terratec)";
                 break;
         case EM2820_BOARD_PINNACLE_USB_2:
-                dev->init_data.ir_codes = &ir_codes_pinnacle_grey_table;
+                dev->init_data.ir_codes = RC_MAP_PINNACLE_GREY;
                 dev->init_data.get_key = em28xx_get_key_pinnacle_usb_grey;
                 dev->init_data.name = "i2c IR (EM28XX Pinnacle PCTV)";
                 break;
         case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2:
-                dev->init_data.ir_codes = &ir_codes_rc5_hauppauge_new_table;
+                dev->init_data.ir_codes = RC_MAP_RC5_HAUPPAUGE_NEW;
                 dev->init_data.get_key = em28xx_get_key_em_haup;
                 dev->init_data.name = "i2c IR (EM2840 Hauppauge)";
         case EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE:
-                dev->init_data.ir_codes = &ir_codes_winfast_usbii_deluxe_table;;
+                dev->init_data.ir_codes = RC_MAP_WINFAST_USBII_DELUXE;;
                 dev->init_data.get_key = em28xx_get_key_winfast_usbii_deluxe;
                 dev->init_data.name = "i2c IR (EM2820 Winfast TV USBII Deluxe)";
                 break;
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index a41cc5566778..d3813ed789d9 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -782,11 +782,15 @@ int em28xx_resolution_set(struct em28xx *dev)
 
         em28xx_accumulator_set(dev, 1, (width - 4) >> 2, 1, (height - 4) >> 2);
 
-        /* If we don't set the start position to 4 in VBI mode, we end up
-           with line 21 being YUYV encoded instead of being in 8-bit
-           greyscale */
+        /* If we don't set the start position to 2 in VBI mode, we end up
+           with line 20/21 being YUYV encoded instead of being in 8-bit
+           greyscale.  The core of the issue is that line 21 (and line 23 for
+           PAL WSS) are inside of active video region, and as a result they
+           get the pixelformatting associated with that area.  So by cropping
+           it out, we end up with the same format as the rest of the VBI
+           region */
         if (em28xx_vbi_supported(dev) == 1)
-                em28xx_capture_area_set(dev, 0, 4, width >> 2, height >> 2);
+                em28xx_capture_area_set(dev, 0, 2, width >> 2, height >> 2);
         else
                 em28xx_capture_area_set(dev, 0, 0, width >> 2, height >> 2);
 
@@ -1174,21 +1178,18 @@ void em28xx_add_into_devlist(struct em28xx *dev)
  */
 
 static LIST_HEAD(em28xx_extension_devlist);
-static DEFINE_MUTEX(em28xx_extension_devlist_lock);
 
 int em28xx_register_extension(struct em28xx_ops *ops)
 {
         struct em28xx *dev = NULL;
 
         mutex_lock(&em28xx_devlist_mutex);
-        mutex_lock(&em28xx_extension_devlist_lock);
         list_add_tail(&ops->next, &em28xx_extension_devlist);
         list_for_each_entry(dev, &em28xx_devlist, devlist) {
                 if (dev)
                         ops->init(dev);
         }
         printk(KERN_INFO "Em28xx: Initialized (%s) extension\n", ops->name);
-        mutex_unlock(&em28xx_extension_devlist_lock);
         mutex_unlock(&em28xx_devlist_mutex);
         return 0;
 }
@@ -1204,10 +1205,8 @@ void em28xx_unregister_extension(struct em28xx_ops *ops)
                         ops->fini(dev);
         }
 
-        mutex_lock(&em28xx_extension_devlist_lock);
         printk(KERN_INFO "Em28xx: Removed (%s) extension\n", ops->name);
         list_del(&ops->next);
-        mutex_unlock(&em28xx_extension_devlist_lock);
         mutex_unlock(&em28xx_devlist_mutex);
 }
 EXPORT_SYMBOL(em28xx_unregister_extension);
@@ -1216,26 +1215,26 @@ void em28xx_init_extension(struct em28xx *dev)
 {
         struct em28xx_ops *ops = NULL;
 
-        mutex_lock(&em28xx_extension_devlist_lock);
+        mutex_lock(&em28xx_devlist_mutex);
         if (!list_empty(&em28xx_extension_devlist)) {
                 list_for_each_entry(ops, &em28xx_extension_devlist, next) {
                         if (ops->init)
                                 ops->init(dev);
                 }
         }
-        mutex_unlock(&em28xx_extension_devlist_lock);
+        mutex_unlock(&em28xx_devlist_mutex);
 }
 
 void em28xx_close_extension(struct em28xx *dev)
 {
         struct em28xx_ops *ops = NULL;
 
-        mutex_lock(&em28xx_extension_devlist_lock);
+        mutex_lock(&em28xx_devlist_mutex);
         if (!list_empty(&em28xx_extension_devlist)) {
                 list_for_each_entry(ops, &em28xx_extension_devlist, next) {
                         if (ops->fini)
                                 ops->fini(dev);
                 }
         }
-        mutex_unlock(&em28xx_extension_devlist_lock);
+        mutex_unlock(&em28xx_devlist_mutex);
 }
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index bcd3c371009b..cf1d8c3655fc 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -467,6 +467,7 @@ static int dvb_init(struct em28xx *dev)
         }
         dev->dvb = dvb;
 
+        mutex_lock(&dev->lock);
         em28xx_set_mode(dev, EM28XX_DIGITAL_MODE);
         /* init frontend */
         switch (dev->model) {
@@ -506,6 +507,7 @@ static int dvb_init(struct em28xx *dev)
         case EM2880_BOARD_TERRATEC_HYBRID_XS_FR:
         case EM2881_BOARD_PINNACLE_HYBRID_PRO:
         case EM2882_BOARD_DIKOM_DK300:
+        case EM2882_BOARD_KWORLD_VS_DVBT:
                 dvb->frontend = dvb_attach(zl10353_attach,
                                            &em28xx_zl10353_xc3028_no_i2c_gate,
                                            &dev->i2c_adap);
@@ -589,15 +591,16 @@ static int dvb_init(struct em28xx *dev)
         if (result < 0)
                 goto out_free;
 
-        em28xx_set_mode(dev, EM28XX_SUSPEND);
         em28xx_info("Successfully loaded em28xx-dvb\n");
-        return 0;
+ret:
+        em28xx_set_mode(dev, EM28XX_SUSPEND);
+        mutex_unlock(&dev->lock);
+        return result;
 
 out_free:
-        em28xx_set_mode(dev, EM28XX_SUSPEND);
         kfree(dvb);
         dev->dvb = NULL;
-        return result;
+        goto ret;
 }
 
 static int dvb_fini(struct em28xx *dev)
diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c
index 20a0001e8885..5c3fd9411b1f 100644
--- a/drivers/media/video/em28xx/em28xx-input.c
+++ b/drivers/media/video/em28xx/em28xx-input.c
@@ -39,6 +39,8 @@ static unsigned int ir_debug;
 module_param(ir_debug, int, 0644);
 MODULE_PARM_DESC(ir_debug, "enable debug messages [IR]");
 
+#define MODULE_NAME "em28xx"
+
 #define i2cdprintk(fmt, arg...) \
         if (ir_debug) { \
                 printk(KERN_DEBUG "%s/ir: " fmt, ir->name , ## arg); \
@@ -360,14 +362,20 @@ static void em28xx_ir_work(struct work_struct *work)
         schedule_delayed_work(&ir->work, msecs_to_jiffies(ir->polling));
 }
 
-static void em28xx_ir_start(struct em28xx_IR *ir)
+static int em28xx_ir_start(void *priv)
 {
+        struct em28xx_IR *ir = priv;
+
         INIT_DELAYED_WORK(&ir->work, em28xx_ir_work);
         schedule_delayed_work(&ir->work, 0);
+
+        return 0;
 }
 
-static void em28xx_ir_stop(struct em28xx_IR *ir)
+static void em28xx_ir_stop(void *priv)
 {
+        struct em28xx_IR *ir = priv;
+
         cancel_delayed_work_sync(&ir->work);
 }
 
@@ -380,7 +388,6 @@ int em28xx_ir_change_protocol(void *priv, u64 ir_type)
 
         /* Adjust xclk based o IR table for RC5/NEC tables */
 
-        dev->board.ir_codes->ir_type = IR_TYPE_OTHER;
         if (ir_type == IR_TYPE_RC5) {
                 dev->board.xclk |= EM28XX_XCLK_IR_RC5_MODE;
                 ir->full_code = 1;
@@ -388,11 +395,9 @@ int em28xx_ir_change_protocol(void *priv, u64 ir_type)
                 dev->board.xclk &= ~EM28XX_XCLK_IR_RC5_MODE;
                 ir_config = EM2874_IR_NEC;
                 ir->full_code = 1;
-        } else
+        } else if (ir_type != IR_TYPE_UNKNOWN)
                 rc = -EINVAL;
 
-        dev->board.ir_codes->ir_type = ir_type;
-
         em28xx_write_reg_bits(dev, EM28XX_R0F_XCLK, dev->board.xclk,
                               EM28XX_XCLK_IR_RC5_MODE);
 
@@ -443,6 +448,13 @@ int em28xx_ir_init(struct em28xx *dev)
         ir->props.allowed_protos = IR_TYPE_RC5 | IR_TYPE_NEC;
         ir->props.priv = ir;
         ir->props.change_protocol = em28xx_ir_change_protocol;
+        ir->props.open = em28xx_ir_start;
+        ir->props.close = em28xx_ir_stop;
+
+        /* By default, keep protocol field untouched */
+        err = em28xx_ir_change_protocol(ir, IR_TYPE_UNKNOWN);
+        if (err)
+                goto err_out_free;
 
         /* This is how often we ask the chip for IR information */
         ir->polling = 100; /* ms */
@@ -455,7 +467,6 @@ int em28xx_ir_init(struct em28xx *dev)
         strlcat(ir->phys, "/input0", sizeof(ir->phys));
 
         /* Set IR protocol */
-        em28xx_ir_change_protocol(ir, dev->board.ir_codes->ir_type);
         err = ir_input_init(input_dev, &ir->ir, IR_TYPE_OTHER);
         if (err < 0)
                 goto err_out_free;
@@ -470,17 +481,15 @@ int em28xx_ir_init(struct em28xx *dev)
         input_dev->dev.parent = &dev->udev->dev;
 
 
-        em28xx_ir_start(ir);
 
         /* all done */
         err = ir_input_register(ir->input, dev->board.ir_codes,
-                                &ir->props);
+                                &ir->props, MODULE_NAME);
         if (err)
                 goto err_out_stop;
 
         return 0;
  err_out_stop:
-        em28xx_ir_stop(ir);
         dev->ir = NULL;
  err_out_free:
         kfree(ir);
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 0fe20110bfd6..20090e34173a 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -203,12 +203,6 @@ static void em28xx_copy_video(struct em28xx *dev,
         if (dma_q->pos + len > buf->vb.size)
                 len = buf->vb.size - dma_q->pos;
 
-        if (p[0] != 0x88 && p[0] != 0x22) {
-                em28xx_isocdbg("frame is not complete\n");
-                len += 4;
-        } else
-                p += 4;
-
         startread = p;
         remain = len;
 
@@ -309,14 +303,6 @@ static void em28xx_copy_vbi(struct em28xx *dev,
         if (dma_q->pos + len > buf->vb.size)
                 len = buf->vb.size - dma_q->pos;
 
-        if ((p[0] == 0x33 && p[1] == 0x95) ||
-            (p[0] == 0x88 && p[1] == 0x88)) {
-                /* Header field, advance past it */
-                p += 4;
-        } else {
-                len += 4;
-        }
-
         startread = p;
 
         startwrite = outp + dma_q->pos;
@@ -507,8 +493,15 @@ static inline int em28xx_isoc_copy(struct em28xx *dev, struct urb *urb)
 
                         dma_q->pos = 0;
                 }
-                if (buf != NULL)
+                if (buf != NULL) {
+                        if (p[0] != 0x88 && p[0] != 0x22) {
+                                em28xx_isocdbg("frame is not complete\n");
+                                len += 4;
+                        } else {
+                                p += 4;
+                        }
                         em28xx_copy_video(dev, dma_q, buf, p, outp, len);
+                }
         }
         return rc;
 }
@@ -555,8 +548,7 @@ static inline int em28xx_isoc_copy_vbi(struct em28xx *dev, struct urb *urb)
                                 continue;
                 }
 
-                len = urb->iso_frame_desc[i].actual_length - 4;
-
+                len = urb->iso_frame_desc[i].actual_length;
                 if (urb->iso_frame_desc[i].actual_length <= 0) {
                         /* em28xx_isocdbg("packet %d is empty",i); - spammy */
                         continue;
@@ -577,6 +569,17 @@ static inline int em28xx_isoc_copy_vbi(struct em28xx *dev, struct urb *urb)
                         dev->vbi_read = 0;
                         em28xx_isocdbg("VBI START HEADER!!!\n");
                         dev->cur_field = p[2];
+                        p += 4;
+                        len -= 4;
+                } else if (p[0] == 0x88 && p[1] == 0x88 &&
+                           p[2] == 0x88 && p[3] == 0x88) {
+                        /* continuation */
+                        p += 4;
+                        len -= 4;
+                } else if (p[0] == 0x22 && p[1] == 0x5a) {
+                        /* start video */
+                        p += 4;
+                        len -= 4;
                 }
 
                 vbi_size = dev->vbi_width * dev->vbi_height;
@@ -631,9 +634,6 @@ static inline int em28xx_isoc_copy_vbi(struct em28xx *dev, struct urb *urb)
 
                 if (dev->capture_type == 1) {
                         dev->capture_type = 2;
-                        em28xx_isocdbg("Video frame %d, length=%i, %s\n", p[2],
-                                       len, (p[2] & 1) ? "odd" : "even");
-
                         if (dev->progressive || !(dev->cur_field & 1)) {
                                 if (buf != NULL)
                                         buffer_filled(dev, dma_q, buf);
@@ -652,8 +652,25 @@ static inline int em28xx_isoc_copy_vbi(struct em28xx *dev, struct urb *urb)
 
                         dma_q->pos = 0;
                 }
-                if (buf != NULL && dev->capture_type == 2)
-                        em28xx_copy_video(dev, dma_q, buf, p, outp, len);
+
+                if (buf != NULL && dev->capture_type == 2) {
+                        if (len > 4 && p[0] == 0x88 && p[1] == 0x88 &&
+                            p[2] == 0x88 && p[3] == 0x88) {
+                                p += 4;
+                                len -= 4;
+                        }
+                        if (len > 4 && p[0] == 0x22 && p[1] == 0x5a) {
+                                em28xx_isocdbg("Video frame %d, len=%i, %s\n",
+                                               p[2], len, (p[2] & 1) ?
+                                               "odd" : "even");
+                                p += 4;
+                                len -= 4;
+                        }
+
+                        if (len > 0)
+                                em28xx_copy_video(dev, dma_q, buf, p, outp,
+                                                  len);
+                }
         }
         return rc;
 }
@@ -1483,6 +1500,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,
                 return -EINVAL;
 
         strcpy(t->name, "Tuner");
+        t->type = V4L2_TUNER_ANALOG_TV;
 
         mutex_lock(&dev->lock);
         v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, g_tuner, t);
@@ -1814,7 +1832,7 @@ static int vidioc_g_fmt_sliced_vbi_cap(struct file *file, void *priv,
         mutex_lock(&dev->lock);
 
         f->fmt.sliced.service_set = 0;
-        v4l2_device_call_all(&dev->v4l2_dev, 0, video, g_fmt, f);
+        v4l2_device_call_all(&dev->v4l2_dev, 0, vbi, g_sliced_fmt, &f->fmt.sliced);
 
         if (f->fmt.sliced.service_set == 0)
                 rc = -EINVAL;
@@ -1836,7 +1854,7 @@ static int vidioc_try_set_sliced_vbi_cap(struct file *file, void *priv,
                 return rc;
 
         mutex_lock(&dev->lock);
-        v4l2_device_call_all(&dev->v4l2_dev, 0, video, g_fmt, f);
+        v4l2_device_call_all(&dev->v4l2_dev, 0, vbi, g_sliced_fmt, &f->fmt.sliced);
         mutex_unlock(&dev->lock);
 
         if (f->fmt.sliced.service_set == 0)
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index ba6fe5daff84..b252d1b1b2a7 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -68,6 +68,7 @@
 #define EM2820_BOARD_HERCULES_SMART_TV_USB2       26
 #define EM2820_BOARD_PINNACLE_USB_2_FM1216ME      27
 #define EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE 28
+#define EM2860_BOARD_TVP5150_REFERENCE_DESIGN     29
 #define EM2820_BOARD_VIDEOLOGY_20K14XUSB          30
 #define EM2821_BOARD_USBGEAR_VD204                31
 #define EM2821_BOARD_SUPERCOMP_USB_2              32
@@ -140,10 +141,10 @@
 #define EM28XX_NUM_BUFS 5
 
 /* number of packets for each buffer
-   windows requests only 40 packets .. so we better do the same
+   windows requests only 64 packets .. so we better do the same
    this is what I found out for all alternate numbers there!
  */
-#define EM28XX_NUM_PACKETS 40
+#define EM28XX_NUM_PACKETS 64
 
 #define EM28XX_INTERLACED_DEFAULT 1
 
@@ -411,7 +412,7 @@ struct em28xx_board {
 
         struct em28xx_input       input[MAX_EM28XX_INPUT];
         struct em28xx_input       radio;
-        struct ir_scancode_table  *ir_codes;
+        char                      *ir_codes;
 };
 
 struct em28xx_eeprom {