9 files changed, 160 insertions, 134 deletions

diff --git a/drivers/media/pci/ivtv/ivtv-alsa-main.c b/drivers/media/pci/ivtv/ivtv-alsa-main.c
index 39b52929755a..41fa21534edf 100644
--- a/drivers/media/pci/ivtv/ivtv-alsa-main.c
+++ b/drivers/media/pci/ivtv/ivtv-alsa-main.c
@@ -224,7 +224,7 @@ static int ivtv_alsa_load(struct ivtv *itv)
         }
 
         s = &itv->streams[IVTV_ENC_STREAM_TYPE_PCM];
-        if (s->vdev == NULL) {
+        if (s->vdev.v4l2_dev == NULL) {
                 IVTV_DEBUG_ALSA_INFO("%s: PCM stream for card is disabled - "
                                      "skipping\n", __func__);
                 return 0;
diff --git a/drivers/media/pci/ivtv/ivtv-alsa-pcm.c b/drivers/media/pci/ivtv/ivtv-alsa-pcm.c
index 7bf9cbca4fa6..f198b9826ed8 100644
--- a/drivers/media/pci/ivtv/ivtv-alsa-pcm.c
+++ b/drivers/media/pci/ivtv/ivtv-alsa-pcm.c
@@ -167,7 +167,7 @@ static int snd_ivtv_pcm_capture_open(struct snd_pcm_substream *substream)
 
         s = &itv->streams[IVTV_ENC_STREAM_TYPE_PCM];
 
-        v4l2_fh_init(&item.fh, s->vdev);
+        v4l2_fh_init(&item.fh, &s->vdev);
         item.itv = itv;
         item.type = s->type;
 
diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
index 802642d26643..c2e60b4f292d 100644
--- a/drivers/media/pci/ivtv/ivtv-driver.c
+++ b/drivers/media/pci/ivtv/ivtv-driver.c
@@ -1284,7 +1284,7 @@ static int ivtv_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
         return 0;
 
 free_streams:
-        ivtv_streams_cleanup(itv, 1);
+        ivtv_streams_cleanup(itv);
 free_irq:
         free_irq(itv->pdev->irq, (void *)itv);
 free_i2c:
@@ -1444,7 +1444,7 @@ static void ivtv_remove(struct pci_dev *pdev)
         flush_kthread_worker(&itv->irq_worker);
         kthread_stop(itv->irq_worker_task);
 
-        ivtv_streams_cleanup(itv, 1);
+        ivtv_streams_cleanup(itv);
         ivtv_udma_free(itv);
 
         v4l2_ctrl_handler_free(&itv->cxhdl.hdl);
diff --git a/drivers/media/pci/ivtv/ivtv-driver.h b/drivers/media/pci/ivtv/ivtv-driver.h
index bc309f42c8ed..e8b6c7ad2ba9 100644
--- a/drivers/media/pci/ivtv/ivtv-driver.h
+++ b/drivers/media/pci/ivtv/ivtv-driver.h
@@ -327,7 +327,7 @@ struct ivtv;				/* forward reference */
 struct ivtv_stream {
         /* These first four fields are always set, even if the stream
            is not actually created. */
-        struct video_device *vdev;      /* NULL when stream not created */
+        struct video_device vdev;       /* vdev.v4l2_dev is NULL if there is no device */
         struct ivtv *itv;               /* for ease of use */
         const char *name;               /* name of the stream */
         int type;                       /* stream type */
diff --git a/drivers/media/pci/ivtv/ivtv-fileops.c b/drivers/media/pci/ivtv/ivtv-fileops.c
index e5ff6277ca85..605d280d8a5f 100644
--- a/drivers/media/pci/ivtv/ivtv-fileops.c
+++ b/drivers/media/pci/ivtv/ivtv-fileops.c
@@ -995,7 +995,7 @@ static int ivtv_open(struct file *filp)
                 IVTV_DEBUG_WARN("nomem on v4l2 open\n");
                 return -ENOMEM;
         }
-        v4l2_fh_init(&item->fh, s->vdev);
+        v4l2_fh_init(&item->fh, &s->vdev);
         item->itv = itv;
         item->type = s->type;
 
diff --git a/drivers/media/pci/ivtv/ivtv-ioctl.c b/drivers/media/pci/ivtv/ivtv-ioctl.c
index 4d8ee18c3feb..6fe6c4a0e858 100644
--- a/drivers/media/pci/ivtv/ivtv-ioctl.c
+++ b/drivers/media/pci/ivtv/ivtv-ioctl.c
@@ -448,9 +448,12 @@ static int ivtv_g_fmt_vid_out(struct file *file, void *fh, struct v4l2_format *f
 static int ivtv_g_fmt_vid_out_overlay(struct file *file, void *fh, struct v4l2_format *fmt)
 {
         struct ivtv *itv = fh2id(fh)->itv;
+        struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
         struct v4l2_window *winfmt = &fmt->fmt.win;
 
-        if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))
+        if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
+                return -EINVAL;
+        if (!itv->osd_video_pbase)
                 return -EINVAL;
         winfmt->chromakey = itv->osd_chroma_key;
         winfmt->global_alpha = itv->osd_global_alpha;
@@ -555,10 +558,13 @@ static int ivtv_try_fmt_vid_out(struct file *file, void *fh, struct v4l2_format
 static int ivtv_try_fmt_vid_out_overlay(struct file *file, void *fh, struct v4l2_format *fmt)
 {
         struct ivtv *itv = fh2id(fh)->itv;
+        struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
         u32 chromakey = fmt->fmt.win.chromakey;
         u8 global_alpha = fmt->fmt.win.global_alpha;
 
-        if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))
+        if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
+                return -EINVAL;
+        if (!itv->osd_video_pbase)
                 return -EINVAL;
         ivtv_g_fmt_vid_out_overlay(file, fh, fmt);
         fmt->fmt.win.chromakey = chromakey;
@@ -741,6 +747,11 @@ static int ivtv_querycap(struct file *file, void *fh, struct v4l2_capability *vc
         snprintf(vcap->bus_info, sizeof(vcap->bus_info), "PCI:%s", pci_name(itv->pdev));
         vcap->capabilities = itv->v4l2_cap | V4L2_CAP_DEVICE_CAPS;
         vcap->device_caps = s->caps;
+        if ((s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY) &&
+            !itv->osd_video_pbase) {
+                vcap->capabilities &= ~V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
+                vcap->device_caps &= ~V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
+        }
         return 0;
 }
 
@@ -816,80 +827,103 @@ static int ivtv_cropcap(struct file *file, void *fh, struct v4l2_cropcap *cropca
 {
         struct ivtv_open_id *id = fh2id(fh);
         struct ivtv *itv = id->itv;
-        struct yuv_playback_info *yi = &itv->yuv_info;
-        int streamtype;
-
-        streamtype = id->type;
 
-        if (cropcap->type != V4L2_BUF_TYPE_VIDEO_OUTPUT)
-                return -EINVAL;
-        cropcap->bounds.top = cropcap->bounds.left = 0;
-        cropcap->bounds.width = 720;
         if (cropcap->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
-                cropcap->bounds.height = itv->is_50hz ? 576 : 480;
                 cropcap->pixelaspect.numerator = itv->is_50hz ? 59 : 10;
                 cropcap->pixelaspect.denominator = itv->is_50hz ? 54 : 11;
-        } else if (streamtype == IVTV_DEC_STREAM_TYPE_YUV) {
-                if (yi->track_osd) {
-                        cropcap->bounds.width = yi->osd_full_w;
-                        cropcap->bounds.height = yi->osd_full_h;
-                } else {
-                        cropcap->bounds.width = 720;
-                        cropcap->bounds.height =
-                                        itv->is_out_50hz ? 576 : 480;
-                }
+        } else if (cropcap->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
                 cropcap->pixelaspect.numerator = itv->is_out_50hz ? 59 : 10;
                 cropcap->pixelaspect.denominator = itv->is_out_50hz ? 54 : 11;
         } else {
-                cropcap->bounds.height = itv->is_out_50hz ? 576 : 480;
-                cropcap->pixelaspect.numerator = itv->is_out_50hz ? 59 : 10;
-                cropcap->pixelaspect.denominator = itv->is_out_50hz ? 54 : 11;
+                return -EINVAL;
         }
-        cropcap->defrect = cropcap->bounds;
         return 0;
 }
 
-static int ivtv_s_crop(struct file *file, void *fh, const struct v4l2_crop *crop)
+static int ivtv_s_selection(struct file *file, void *fh,
+                            struct v4l2_selection *sel)
 {
         struct ivtv_open_id *id = fh2id(fh);
         struct ivtv *itv = id->itv;
         struct yuv_playback_info *yi = &itv->yuv_info;
-        int streamtype;
+        struct v4l2_rect r = { 0, 0, 720, 0 };
+        int streamtype = id->type;
 
-        streamtype = id->type;
+        if (sel->type != V4L2_BUF_TYPE_VIDEO_OUTPUT ||
+            !(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))
+                return -EINVAL;
 
-        if (crop->type == V4L2_BUF_TYPE_VIDEO_OUTPUT &&
-            (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT)) {
-                if (streamtype == IVTV_DEC_STREAM_TYPE_YUV) {
-                        yi->main_rect = crop->c;
-                        return 0;
-                } else {
-                        if (!ivtv_vapi(itv, CX2341X_OSD_SET_FRAMEBUFFER_WINDOW, 4,
-                                crop->c.width, crop->c.height, crop->c.left, crop->c.top)) {
-                                itv->main_rect = crop->c;
-                                return 0;
-                        }
-                }
+        if (sel->target != V4L2_SEL_TGT_COMPOSE)
                 return -EINVAL;
+
+
+        if (sel->type != V4L2_BUF_TYPE_VIDEO_OUTPUT ||
+            !(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))
+                return -EINVAL;
+
+        r.height = itv->is_out_50hz ? 576 : 480;
+        if (streamtype == IVTV_DEC_STREAM_TYPE_YUV && yi->track_osd) {
+                r.width = yi->osd_full_w;
+                r.height = yi->osd_full_h;
+        }
+        sel->r.width = clamp(sel->r.width, 16U, r.width);
+        sel->r.height = clamp(sel->r.height, 16U, r.height);
+        sel->r.left = clamp_t(unsigned, sel->r.left, 0, r.width - sel->r.width);
+        sel->r.top = clamp_t(unsigned, sel->r.top, 0, r.height - sel->r.height);
+
+        if (streamtype == IVTV_DEC_STREAM_TYPE_YUV) {
+                yi->main_rect = sel->r;
+                return 0;
+        }
+        if (!ivtv_vapi(itv, CX2341X_OSD_SET_FRAMEBUFFER_WINDOW, 4,
+                        sel->r.width, sel->r.height, sel->r.left, sel->r.top)) {
+                itv->main_rect = sel->r;
+                return 0;
         }
         return -EINVAL;
 }
 
-static int ivtv_g_crop(struct file *file, void *fh, struct v4l2_crop *crop)
+static int ivtv_g_selection(struct file *file, void *fh,
+                            struct v4l2_selection *sel)
 {
         struct ivtv_open_id *id = fh2id(fh);
         struct ivtv *itv = id->itv;
         struct yuv_playback_info *yi = &itv->yuv_info;
-        int streamtype;
+        struct v4l2_rect r = { 0, 0, 720, 0 };
+        int streamtype = id->type;
+
+        if (sel->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                switch (sel->target) {
+                case V4L2_SEL_TGT_CROP_DEFAULT:
+                case V4L2_SEL_TGT_CROP_BOUNDS:
+                        sel->r.top = sel->r.left = 0;
+                        sel->r.width = 720;
+                        sel->r.height = itv->is_50hz ? 576 : 480;
+                        return 0;
+                default:
+                        return -EINVAL;
+                }
+        }
 
-        streamtype = id->type;
+        if (sel->type != V4L2_BUF_TYPE_VIDEO_OUTPUT ||
+            !(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))
+                return -EINVAL;
 
-        if (crop->type == V4L2_BUF_TYPE_VIDEO_OUTPUT &&
-            (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT)) {
+        switch (sel->target) {
+        case V4L2_SEL_TGT_COMPOSE:
                 if (streamtype == IVTV_DEC_STREAM_TYPE_YUV)
-                        crop->c = yi->main_rect;
+                        sel->r = yi->main_rect;
                 else
-                        crop->c = itv->main_rect;
+                        sel->r = itv->main_rect;
+                return 0;
+        case V4L2_SEL_TGT_COMPOSE_DEFAULT:
+        case V4L2_SEL_TGT_COMPOSE_BOUNDS:
+                r.height = itv->is_out_50hz ? 576 : 480;
+                if (streamtype == IVTV_DEC_STREAM_TYPE_YUV && yi->track_osd) {
+                        r.width = yi->osd_full_w;
+                        r.height = yi->osd_full_h;
+                }
+                sel->r = r;
                 return 0;
         }
         return -EINVAL;
@@ -987,7 +1021,7 @@ int ivtv_s_input(struct file *file, void *fh, unsigned int inp)
         else
                 std = V4L2_STD_ALL;
         for (i = 0; i <= IVTV_ENC_STREAM_TYPE_VBI; i++)
-                itv->streams[i].vdev->tvnorms = std;
+                itv->streams[i].vdev.tvnorms = std;
 
         /* prevent others from messing with the streams until
            we're finished changing inputs. */
@@ -1038,7 +1072,7 @@ static int ivtv_g_frequency(struct file *file, void *fh, struct v4l2_frequency *
         struct ivtv *itv = fh2id(fh)->itv;
         struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
 
-        if (s->vdev->vfl_dir)
+        if (s->vdev.vfl_dir)
                 return -ENOTTY;
         if (vf->tuner != 0)
                 return -EINVAL;
@@ -1052,7 +1086,7 @@ int ivtv_s_frequency(struct file *file, void *fh, const struct v4l2_frequency *v
         struct ivtv *itv = fh2id(fh)->itv;
         struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
 
-        if (s->vdev->vfl_dir)
+        if (s->vdev.vfl_dir)
                 return -ENOTTY;
         if (vf->tuner != 0)
                 return -EINVAL;
@@ -1340,6 +1374,7 @@ static int ivtv_try_encoder_cmd(struct file *file, void *fh, struct v4l2_encoder
 static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb)
 {
         struct ivtv *itv = fh2id(fh)->itv;
+        struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
         u32 data[CX2341X_MBOX_MAX_DATA];
         struct yuv_playback_info *yi = &itv->yuv_info;
 
@@ -1363,10 +1398,10 @@ static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb)
                 0,
         };
 
-        if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
-                return -EINVAL;
+        if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
+                return -ENOTTY;
         if (!itv->osd_video_pbase)
-                return -EINVAL;
+                return -ENOTTY;
 
         fb->capability = V4L2_FBUF_CAP_EXTERNOVERLAY | V4L2_FBUF_CAP_CHROMAKEY |
                 V4L2_FBUF_CAP_GLOBAL_ALPHA;
@@ -1427,12 +1462,13 @@ static int ivtv_s_fbuf(struct file *file, void *fh, const struct v4l2_framebuffe
 {
         struct ivtv_open_id *id = fh2id(fh);
         struct ivtv *itv = id->itv;
+        struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
         struct yuv_playback_info *yi = &itv->yuv_info;
 
-        if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
-                return -EINVAL;
+        if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
+                return -ENOTTY;
         if (!itv->osd_video_pbase)
-                return -EINVAL;
+                return -ENOTTY;
 
         itv->osd_global_alpha_state = (fb->flags & V4L2_FBUF_FLAG_GLOBAL_ALPHA) != 0;
         itv->osd_local_alpha_state =
@@ -1447,9 +1483,12 @@ static int ivtv_overlay(struct file *file, void *fh, unsigned int on)
 {
         struct ivtv_open_id *id = fh2id(fh);
         struct ivtv *itv = id->itv;
+        struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
 
-        if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
-                return -EINVAL;
+        if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
+                return -ENOTTY;
+        if (!itv->osd_video_pbase)
+                return -ENOTTY;
 
         ivtv_vapi(itv, CX2341X_OSD_SET_STATE, 1, on != 0);
 
@@ -1547,7 +1586,7 @@ static int ivtv_log_status(struct file *file, void *fh)
         for (i = 0; i < IVTV_MAX_STREAMS; i++) {
                 struct ivtv_stream *s = &itv->streams[i];
 
-                if (s->vdev == NULL || s->buffers == 0)
+                if (s->vdev.v4l2_dev == NULL || s->buffers == 0)
                         continue;
                 IVTV_INFO("Stream %s: status 0x%04lx, %d%% of %d KiB (%d buffers) in use\n", s->name, s->s_flags,
                                 (s->buffers - s->q_free.buffers) * 100 / s->buffers,
@@ -1837,8 +1876,8 @@ static const struct v4l2_ioctl_ops ivtv_ioctl_ops = {
         .vidioc_enum_output                 = ivtv_enum_output,
         .vidioc_enumaudout                  = ivtv_enumaudout,
         .vidioc_cropcap                     = ivtv_cropcap,
-        .vidioc_s_crop                      = ivtv_s_crop,
-        .vidioc_g_crop                      = ivtv_g_crop,
+        .vidioc_s_selection                 = ivtv_s_selection,
+        .vidioc_g_selection                 = ivtv_g_selection,
         .vidioc_g_input                     = ivtv_g_input,
         .vidioc_s_input                     = ivtv_s_input,
         .vidioc_g_output                    = ivtv_g_output,
diff --git a/drivers/media/pci/ivtv/ivtv-irq.c b/drivers/media/pci/ivtv/ivtv-irq.c
index e7d701777e53..36ca2d67c812 100644
--- a/drivers/media/pci/ivtv/ivtv-irq.c
+++ b/drivers/media/pci/ivtv/ivtv-irq.c
@@ -75,7 +75,7 @@ static void ivtv_pio_work_handler(struct ivtv *itv)
 
         IVTV_DEBUG_HI_DMA("ivtv_pio_work_handler\n");
         if (itv->cur_pio_stream < 0 || itv->cur_pio_stream >= IVTV_MAX_STREAMS ||
-                        s->vdev == NULL || !ivtv_use_pio(s)) {
+                        s->vdev.v4l2_dev == NULL || !ivtv_use_pio(s)) {
                 itv->cur_pio_stream = -1;
                 /* trigger PIO complete user interrupt */
                 write_reg(IVTV_IRQ_ENC_PIO_COMPLETE, 0x44);
@@ -132,7 +132,7 @@ static int stream_enc_dma_append(struct ivtv_stream *s, u32 data[CX2341X_MBOX_MA
         int rc;
 
         /* sanity checks */
-        if (s->vdev == NULL) {
+        if (s->vdev.v4l2_dev == NULL) {
                 IVTV_DEBUG_WARN("Stream %s not started\n", s->name);
                 return -1;
         }
@@ -890,8 +890,8 @@ static void ivtv_irq_vsync(struct ivtv *itv)
                         if (s)
                                 wake_up(&s->waitq);
                 }
-                if (s && s->vdev)
-                        v4l2_event_queue(s->vdev, frame ? &evtop : &evbottom);
+                if (s && s->vdev.v4l2_dev)
+                        v4l2_event_queue(&s->vdev, frame ? &evtop : &evbottom);
                 wake_up(&itv->vsync_waitq);
 
                 /* Send VBI to saa7127 */
diff --git a/drivers/media/pci/ivtv/ivtv-streams.c b/drivers/media/pci/ivtv/ivtv-streams.c
index f0a1cc472313..d27c6df97566 100644
--- a/drivers/media/pci/ivtv/ivtv-streams.c
+++ b/drivers/media/pci/ivtv/ivtv-streams.c
@@ -130,7 +130,8 @@ static struct {
                 "decoder MPG",
                 VFL_TYPE_GRABBER, IVTV_V4L2_DEC_MPG_OFFSET,
                 PCI_DMA_TODEVICE, 0,
-                V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE,
+                V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE |
+                V4L2_CAP_VIDEO_OUTPUT_OVERLAY,
                 &ivtv_v4l2_dec_fops
         },
         {       /* IVTV_DEC_STREAM_TYPE_VBI */
@@ -151,7 +152,8 @@ static struct {
                 "decoder YUV",
                 VFL_TYPE_GRABBER, IVTV_V4L2_DEC_YUV_OFFSET,
                 PCI_DMA_TODEVICE, 0,
-                V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE,
+                V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE |
+                V4L2_CAP_VIDEO_OUTPUT_OVERLAY,
                 &ivtv_v4l2_dec_fops
         }
 };
@@ -159,11 +161,9 @@ static struct {
 static void ivtv_stream_init(struct ivtv *itv, int type)
 {
         struct ivtv_stream *s = &itv->streams[type];
-        struct video_device *vdev = s->vdev;
 
         /* we need to keep vdev, so restore it afterwards */
         memset(s, 0, sizeof(*s));
-        s->vdev = vdev;
 
         /* initialize ivtv_stream fields */
         s->itv = itv;
@@ -194,10 +194,10 @@ static int ivtv_prep_dev(struct ivtv *itv, int type)
         int num_offset = ivtv_stream_info[type].num_offset;
         int num = itv->instance + ivtv_first_minor + num_offset;
 
-        /* These four fields are always initialized. If vdev == NULL, then
+        /* These four fields are always initialized. If vdev.v4l2_dev == NULL, then
            this stream is not in use. In that case no other fields but these
            four can be used. */
-        s->vdev = NULL;
+        s->vdev.v4l2_dev = NULL;
         s->itv = itv;
         s->type = type;
         s->name = ivtv_stream_info[type].name;
@@ -218,40 +218,33 @@ static int ivtv_prep_dev(struct ivtv *itv, int type)
 
         ivtv_stream_init(itv, type);
 
-        /* allocate and initialize the v4l2 video device structure */
-        s->vdev = video_device_alloc();
-        if (s->vdev == NULL) {
-                IVTV_ERR("Couldn't allocate v4l2 video_device for %s\n", s->name);
-                return -ENOMEM;
-        }
-
-        snprintf(s->vdev->name, sizeof(s->vdev->name), "%s %s",
+        snprintf(s->vdev.name, sizeof(s->vdev.name), "%s %s",
                         itv->v4l2_dev.name, s->name);
 
-        s->vdev->num = num;
-        s->vdev->v4l2_dev = &itv->v4l2_dev;
+        s->vdev.num = num;
+        s->vdev.v4l2_dev = &itv->v4l2_dev;
         if (ivtv_stream_info[type].v4l2_caps &
                         (V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_SLICED_VBI_OUTPUT))
-                s->vdev->vfl_dir = VFL_DIR_TX;
-        s->vdev->fops = ivtv_stream_info[type].fops;
-        s->vdev->ctrl_handler = itv->v4l2_dev.ctrl_handler;
-        s->vdev->release = video_device_release;
-        s->vdev->tvnorms = V4L2_STD_ALL;
-        s->vdev->lock = &itv->serialize_lock;
+                s->vdev.vfl_dir = VFL_DIR_TX;
+        s->vdev.fops = ivtv_stream_info[type].fops;
+        s->vdev.ctrl_handler = itv->v4l2_dev.ctrl_handler;
+        s->vdev.release = video_device_release_empty;
+        s->vdev.tvnorms = V4L2_STD_ALL;
+        s->vdev.lock = &itv->serialize_lock;
         if (s->type == IVTV_DEC_STREAM_TYPE_VBI) {
-                v4l2_disable_ioctl(s->vdev, VIDIOC_S_AUDIO);
-                v4l2_disable_ioctl(s->vdev, VIDIOC_G_AUDIO);
-                v4l2_disable_ioctl(s->vdev, VIDIOC_ENUMAUDIO);
-                v4l2_disable_ioctl(s->vdev, VIDIOC_ENUMINPUT);
-                v4l2_disable_ioctl(s->vdev, VIDIOC_S_INPUT);
-                v4l2_disable_ioctl(s->vdev, VIDIOC_G_INPUT);
-                v4l2_disable_ioctl(s->vdev, VIDIOC_S_FREQUENCY);
-                v4l2_disable_ioctl(s->vdev, VIDIOC_G_FREQUENCY);
-                v4l2_disable_ioctl(s->vdev, VIDIOC_S_TUNER);
-                v4l2_disable_ioctl(s->vdev, VIDIOC_G_TUNER);
-                v4l2_disable_ioctl(s->vdev, VIDIOC_S_STD);
+                v4l2_disable_ioctl(&s->vdev, VIDIOC_S_AUDIO);
+                v4l2_disable_ioctl(&s->vdev, VIDIOC_G_AUDIO);
+                v4l2_disable_ioctl(&s->vdev, VIDIOC_ENUMAUDIO);
+                v4l2_disable_ioctl(&s->vdev, VIDIOC_ENUMINPUT);
+                v4l2_disable_ioctl(&s->vdev, VIDIOC_S_INPUT);
+                v4l2_disable_ioctl(&s->vdev, VIDIOC_G_INPUT);
+                v4l2_disable_ioctl(&s->vdev, VIDIOC_S_FREQUENCY);
+                v4l2_disable_ioctl(&s->vdev, VIDIOC_G_FREQUENCY);
+                v4l2_disable_ioctl(&s->vdev, VIDIOC_S_TUNER);
+                v4l2_disable_ioctl(&s->vdev, VIDIOC_G_TUNER);
+                v4l2_disable_ioctl(&s->vdev, VIDIOC_S_STD);
         }
-        ivtv_set_funcs(s->vdev);
+        ivtv_set_funcs(&s->vdev);
         return 0;
 }
 
@@ -266,7 +259,7 @@ int ivtv_streams_setup(struct ivtv *itv)
                 if (ivtv_prep_dev(itv, type))
                         break;
 
-                if (itv->streams[type].vdev == NULL)
+                if (itv->streams[type].vdev.v4l2_dev == NULL)
                         continue;
 
                 /* Allocate Stream */
@@ -277,7 +270,7 @@ int ivtv_streams_setup(struct ivtv *itv)
                 return 0;
 
         /* One or more streams could not be initialized. Clean 'em all up. */
-        ivtv_streams_cleanup(itv, 0);
+        ivtv_streams_cleanup(itv);
         return -ENOMEM;
 }
 
@@ -288,28 +281,26 @@ static int ivtv_reg_dev(struct ivtv *itv, int type)
         const char *name;
         int num;
 
-        if (s->vdev == NULL)
+        if (s->vdev.v4l2_dev == NULL)
                 return 0;
 
-        num = s->vdev->num;
+        num = s->vdev.num;
         /* card number + user defined offset + device offset */
         if (type != IVTV_ENC_STREAM_TYPE_MPG) {
                 struct ivtv_stream *s_mpg = &itv->streams[IVTV_ENC_STREAM_TYPE_MPG];
 
-                if (s_mpg->vdev)
-                        num = s_mpg->vdev->num + ivtv_stream_info[type].num_offset;
+                if (s_mpg->vdev.v4l2_dev)
+                        num = s_mpg->vdev.num + ivtv_stream_info[type].num_offset;
         }
-        video_set_drvdata(s->vdev, s);
+        video_set_drvdata(&s->vdev, s);
 
         /* Register device. First try the desired minor, then any free one. */
-        if (video_register_device_no_warn(s->vdev, vfl_type, num)) {
+        if (video_register_device_no_warn(&s->vdev, vfl_type, num)) {
                 IVTV_ERR("Couldn't register v4l2 device for %s (device node number %d)\n",
                                 s->name, num);
-                video_device_release(s->vdev);
-                s->vdev = NULL;
                 return -ENOMEM;
         }
-        name = video_device_node_name(s->vdev);
+        name = video_device_node_name(&s->vdev);
 
         switch (vfl_type) {
         case VFL_TYPE_GRABBER:
@@ -346,29 +337,25 @@ int ivtv_streams_register(struct ivtv *itv)
                 return 0;
 
         /* One or more streams could not be initialized. Clean 'em all up. */
-        ivtv_streams_cleanup(itv, 1);
+        ivtv_streams_cleanup(itv);
         return -ENOMEM;
 }
 
 /* Unregister v4l2 devices */
-void ivtv_streams_cleanup(struct ivtv *itv, int unregister)
+void ivtv_streams_cleanup(struct ivtv *itv)
 {
         int type;
 
         /* Teardown all streams */
         for (type = 0; type < IVTV_MAX_STREAMS; type++) {
-                struct video_device *vdev = itv->streams[type].vdev;
+                struct video_device *vdev = &itv->streams[type].vdev;
 
-                itv->streams[type].vdev = NULL;
-                if (vdev == NULL)
+                if (vdev->v4l2_dev == NULL)
                         continue;
 
+                video_unregister_device(vdev);
                 ivtv_stream_free(&itv->streams[type]);
-                /* Unregister or release device */
-                if (unregister)
-                        video_unregister_device(vdev);
-                else
-                        video_device_release(vdev);
+                itv->streams[type].vdev.v4l2_dev = NULL;
         }
 }
 
@@ -492,7 +479,7 @@ int ivtv_start_v4l2_encode_stream(struct ivtv_stream *s)
         int captype = 0, subtype = 0;
         int enable_passthrough = 0;
 
-        if (s->vdev == NULL)
+        if (s->vdev.v4l2_dev == NULL)
                 return -EINVAL;
 
         IVTV_DEBUG_INFO("Start encoder stream %s\n", s->name);
@@ -661,7 +648,7 @@ static int ivtv_setup_v4l2_decode_stream(struct ivtv_stream *s)
         u16 width;
         u16 height;
 
-        if (s->vdev == NULL)
+        if (s->vdev.v4l2_dev == NULL)
                 return -EINVAL;
 
         IVTV_DEBUG_INFO("Setting some initial decoder settings\n");
@@ -723,7 +710,7 @@ int ivtv_start_v4l2_decode_stream(struct ivtv_stream *s, int gop_offset)
         struct ivtv *itv = s->itv;
         int rc;
 
-        if (s->vdev == NULL)
+        if (s->vdev.v4l2_dev == NULL)
                 return -EINVAL;
 
         if (test_and_set_bit(IVTV_F_S_STREAMING, &s->s_flags))
@@ -778,7 +765,7 @@ void ivtv_stop_all_captures(struct ivtv *itv)
         for (i = IVTV_MAX_STREAMS - 1; i >= 0; i--) {
                 struct ivtv_stream *s = &itv->streams[i];
 
-                if (s->vdev == NULL)
+                if (s->vdev.v4l2_dev == NULL)
                         continue;
                 if (test_bit(IVTV_F_S_STREAMING, &s->s_flags)) {
                         ivtv_stop_v4l2_encode_stream(s, 0);
@@ -793,7 +780,7 @@ int ivtv_stop_v4l2_encode_stream(struct ivtv_stream *s, int gop_end)
         int cap_type;
         int stopmode;
 
-        if (s->vdev == NULL)
+        if (s->vdev.v4l2_dev == NULL)
                 return -EINVAL;
 
         /* This function assumes that you are allowed to stop the capture
@@ -917,7 +904,7 @@ int ivtv_stop_v4l2_decode_stream(struct ivtv_stream *s, int flags, u64 pts)
         };
         struct ivtv *itv = s->itv;
 
-        if (s->vdev == NULL)
+        if (s->vdev.v4l2_dev == NULL)
                 return -EINVAL;
 
         if (s->type != IVTV_DEC_STREAM_TYPE_YUV && s->type != IVTV_DEC_STREAM_TYPE_MPG)
@@ -969,7 +956,7 @@ int ivtv_stop_v4l2_decode_stream(struct ivtv_stream *s, int flags, u64 pts)
 
         set_bit(IVTV_F_I_EV_DEC_STOPPED, &itv->i_flags);
         wake_up(&itv->event_waitq);
-        v4l2_event_queue(s->vdev, &ev);
+        v4l2_event_queue(&s->vdev, &ev);
 
         /* wake up wait queues */
         wake_up(&s->waitq);
@@ -982,7 +969,7 @@ int ivtv_passthrough_mode(struct ivtv *itv, int enable)
         struct ivtv_stream *yuv_stream = &itv->streams[IVTV_ENC_STREAM_TYPE_YUV];
         struct ivtv_stream *dec_stream = &itv->streams[IVTV_DEC_STREAM_TYPE_YUV];
 
-        if (yuv_stream->vdev == NULL || dec_stream->vdev == NULL)
+        if (yuv_stream->vdev.v4l2_dev == NULL || dec_stream->vdev.v4l2_dev == NULL)
                 return -EINVAL;
 
         IVTV_DEBUG_INFO("ivtv ioctl: Select passthrough mode\n");
diff --git a/drivers/media/pci/ivtv/ivtv-streams.h b/drivers/media/pci/ivtv/ivtv-streams.h
index a653a5136417..3d76a415fbd8 100644
--- a/drivers/media/pci/ivtv/ivtv-streams.h
+++ b/drivers/media/pci/ivtv/ivtv-streams.h
@@ -23,7 +23,7 @@
 
 int ivtv_streams_setup(struct ivtv *itv);
 int ivtv_streams_register(struct ivtv *itv);
-void ivtv_streams_cleanup(struct ivtv *itv, int unregister);
+void ivtv_streams_cleanup(struct ivtv *itv);
 
 /* Capture related */
 int ivtv_start_v4l2_encode_stream(struct ivtv_stream *s);