7 files changed, 27 insertions, 17 deletions

diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index 317a2a3f9cc1..da7a6b591a67 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -580,7 +580,7 @@ struct cx8802_dev * cx8802_get_device(struct inode *inode)
 
         list_for_each(list,&cx8802_devlist) {
                 h = list_entry(list, struct cx8802_dev, devlist);
-                if (h->mpeg_dev->minor == minor)
+                if (h->mpeg_dev && h->mpeg_dev->minor == minor)
                         return h;
         }
 
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index 5dd519caf81d..0285c4a830eb 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -190,7 +190,9 @@ static void ivtv_update_pgm_info(struct ivtv *itv)
                 int idx = (itv->pgm_info_write_idx + i) % itv->pgm_info_num;
                 struct v4l2_enc_idx_entry *e = itv->pgm_info + idx;
                 u32 addr = itv->pgm_info_offset + 4 + idx * 24;
-                const int mapping[] = { V4L2_ENC_IDX_FRAME_P, V4L2_ENC_IDX_FRAME_I, V4L2_ENC_IDX_FRAME_B, 0 };
+                const int mapping[8] = { -1, V4L2_ENC_IDX_FRAME_I, V4L2_ENC_IDX_FRAME_P, -1,
+                        V4L2_ENC_IDX_FRAME_B, -1, -1, -1 };
+                                        // 1=I, 2=P, 4=B
 
                 e->offset = read_enc(addr + 4) + ((u64)read_enc(addr + 8) << 32);
                 if (e->offset > itv->mpg_data_received) {
@@ -199,7 +201,7 @@ static void ivtv_update_pgm_info(struct ivtv *itv)
                 e->offset += itv->vbi_data_inserted;
                 e->length = read_enc(addr);
                 e->pts = read_enc(addr + 16) + ((u64)(read_enc(addr + 20) & 1) << 32);
-                e->flags = mapping[read_enc(addr + 12) & 3];
+                e->flags = mapping[read_enc(addr + 12) & 7];
                 i++;
         }
         itv->pgm_info_write_idx = (itv->pgm_info_write_idx + i) % itv->pgm_info_num;
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index 5977a79619c2..dfe0aedc60fd 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -1099,14 +1099,21 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
 
         case VIDIOC_G_ENC_INDEX: {
                 struct v4l2_enc_idx *idx = arg;
+                struct v4l2_enc_idx_entry *e = idx->entry;
+                int entries;
                 int i;
 
-                idx->entries = (itv->pgm_info_write_idx + IVTV_MAX_PGM_INDEX - itv->pgm_info_read_idx) %
+                entries = (itv->pgm_info_write_idx + IVTV_MAX_PGM_INDEX - itv->pgm_info_read_idx) %
                                         IVTV_MAX_PGM_INDEX;
-                if (idx->entries > V4L2_ENC_IDX_ENTRIES)
-                        idx->entries = V4L2_ENC_IDX_ENTRIES;
-                for (i = 0; i < idx->entries; i++) {
-                        idx->entry[i] = itv->pgm_info[(itv->pgm_info_read_idx + i) % IVTV_MAX_PGM_INDEX];
+                if (entries > V4L2_ENC_IDX_ENTRIES)
+                        entries = V4L2_ENC_IDX_ENTRIES;
+                idx->entries = 0;
+                for (i = 0; i < entries; i++) {
+                        *e = itv->pgm_info[(itv->pgm_info_read_idx + i) % IVTV_MAX_PGM_INDEX];
+                        if ((e->flags & V4L2_ENC_IDX_FRAME_MASK) <= V4L2_ENC_IDX_FRAME_B) {
+                                idx->entries++;
+                                e++;
+                        }
                 }
                 itv->pgm_info_read_idx = (itv->pgm_info_read_idx + idx->entries) % IVTV_MAX_PGM_INDEX;
                 break;
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index 3d81966d8c42..931b274bffca 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -1243,7 +1243,7 @@ static int pwc_video_close(struct inode *inode, struct file *file)
                                 PWC_ERROR("Failed to power down camera (%d)\n", i);
                 }
                 pdev->vopen--;
-                PWC_DEBUG_OPEN("<< video_close() vopen=%d\n", i);
+                PWC_DEBUG_OPEN("<< video_close() vopen=%d\n", pdev->vopen);
         } else {
                 pwc_cleanup(pdev);
                 /* Free memory (don't set pdev to 0 just yet) */
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 8ec83bd70094..25ec16810818 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -1537,18 +1537,18 @@ struct saa7134_board saa7134_boards[] = {
                 },{
                         .name = name_comp1,
                         .vmux = 0,
-                        .amux = LINE2,
-                        .gpio = 0x00,
+                        .amux = LINE1,
+                        .gpio = 0x02,
                 },{
                         .name = name_comp2,
                         .vmux = 3,
-                        .amux = LINE2,
-                        .gpio = 0x00,
+                        .amux = LINE1,
+                        .gpio = 0x02,
                 },{
                         .name = name_svideo,
                         .vmux = 8,
-                        .amux = LINE2,
-                        .gpio = 0x00,
+                        .amux = LINE1,
+                        .gpio = 0x02,
                 }},
                 .radio = {
                         .name = name_radio,
diff --git a/drivers/media/video/saa7191.c b/drivers/media/video/saa7191.c
index 8615a6081a5d..b4018cce3285 100644
--- a/drivers/media/video/saa7191.c
+++ b/drivers/media/video/saa7191.c
@@ -130,7 +130,7 @@ static int saa7191_write_reg(struct i2c_client *client, u8 reg,
 
 /* the first byte of data must be the first subaddress number (register) */
 static int saa7191_write_block(struct i2c_client *client,
-                               u8 length, u8 *data)
+                               u8 length, const u8 *data)
 {
         int i;
         int ret;
@@ -592,7 +592,7 @@ static int saa7191_attach(struct i2c_adapter *adap, int addr, int kind)
         if (err)
                 goto out_free_decoder;
 
-        err = saa7191_write_block(client, sizeof(initseq), (u8 *)initseq);
+        err = saa7191_write_block(client, sizeof(initseq), initseq);
         if (err) {
                 printk(KERN_ERR "SAA7191 initialization failed\n");
                 goto out_detach_client;
diff --git a/drivers/media/video/usbvision/usbvision-cards.c b/drivers/media/video/usbvision/usbvision-cards.c
index 380564cd3317..f09eb102731b 100644
--- a/drivers/media/video/usbvision/usbvision-cards.c
+++ b/drivers/media/video/usbvision/usbvision-cards.c
@@ -1081,6 +1081,7 @@ struct usb_device_id usbvision_table [] = {
         { USB_DEVICE(0x2304, 0x0301), .driver_info=PINNA_LINX_VD_IN_CAB_PAL },
         { USB_DEVICE(0x2304, 0x0419), .driver_info=PINNA_PCTV_BUNGEE_PAL_FM },
         { USB_DEVICE(0x2400, 0x4200), .driver_info=HPG_WINTV },
+        { },    /* terminate list */
 };
 
 MODULE_DEVICE_TABLE (usb, usbvision_table);