diff options
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-controls.c')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-controls.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-controls.c b/linux/drivers/media/video/ivtv/ivtv-controls.c index d0e39ba2b..7a876c3e5 100644 --- a/linux/drivers/media/video/ivtv/ivtv-controls.c +++ b/linux/drivers/media/video/ivtv/ivtv-controls.c @@ -158,12 +158,12 @@ static int ivtv_setup_vbi_fmt(struct ivtv *itv, enum v4l2_mpeg_stream_vbi_fmt fm if (atomic_read(&itv->capturing) > 0) return -EBUSY; - // First try to allocate sliced VBI buffers if needed. + /* First try to allocate sliced VBI buffers if needed. */ if (fmt && itv->vbi.sliced_mpeg_data[0] == NULL) { int i; for (i = 0; i < IVTV_VBI_FRAMES; i++) { - // Yuck, hardcoded. Needs to be a define + /* Yuck, hardcoded. Needs to be a define */ itv->vbi.sliced_mpeg_data[i] = kmalloc(2049, GFP_KERNEL); if (itv->vbi.sliced_mpeg_data[i] == NULL) { while (--i >= 0) { @@ -246,13 +246,7 @@ int ivtv_control_ioctls(struct ivtv *itv, unsigned int cmd, void *arg) fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; fmt.fmt.pix.width = itv->params.width / (is_mpeg1 ? 2 : 1); fmt.fmt.pix.height = itv->params.height; -// if (atomic_read(&itv->capturing) > 0) { -// IVTV_DEBUG_WARN( -// "v4l2 ioctl: set size failed, " -// "capture in progress\n"); -// } else { - itv->video_dec_func(itv, VIDIOC_S_FMT, &fmt); -// } + itv->video_dec_func(itv, VIDIOC_S_FMT, &fmt); } err = cx2341x_update(itv, ivtv_api_func, &itv->params, &p); if (!err && itv->params.stream_vbi_fmt != p.stream_vbi_fmt) { |