Merge tag 'backlight-for-linus-3.17' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / media / common / saa7146 / saa7146_fops.c

diff --git a/drivers/media/common/saa7146/saa7146_fops.c b/drivers/media/common/saa7146/saa7146_fops.c
index eda01bc68ab200272f9c4b247302f407d5ae13f4..d9e1d6395ed9499f2df0e681bfa04b46b3d1adfe 100644 (file)
--- a/drivers/media/common/saa7146/saa7146_fops.c
+++ b/drivers/media/common/saa7146/saa7146_fops.c
@@ -533,13 +533,12 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv)
        if (dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE)
                saa7146_vbi_uops.init(dev,vv);
 
-       fmt = &vv->ov_fb.fmt;
-       fmt->width = vv->standard->h_max_out;
-       fmt->height = vv->standard->v_max_out;
-       fmt->pixelformat = V4L2_PIX_FMT_RGB565;
-       fmt->bytesperline = 2 * fmt->width;
-       fmt->sizeimage = fmt->bytesperline * fmt->height;
-       fmt->colorspace = V4L2_COLORSPACE_SRGB;
+       vv->ov_fb.fmt.width = vv->standard->h_max_out;
+       vv->ov_fb.fmt.height = vv->standard->v_max_out;
+       vv->ov_fb.fmt.pixelformat = V4L2_PIX_FMT_RGB565;
+       vv->ov_fb.fmt.bytesperline = 2 * vv->ov_fb.fmt.width;
+       vv->ov_fb.fmt.sizeimage = vv->ov_fb.fmt.bytesperline * vv->ov_fb.fmt.height;
+       vv->ov_fb.fmt.colorspace = V4L2_COLORSPACE_SRGB;
 
        fmt = &vv->video_fmt;
        fmt->width = 384;
@@ -613,7 +612,6 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev,
        vfd->lock = &dev->v4l2_lock;
        vfd->v4l2_dev = &dev->v4l2_dev;
        vfd->tvnorms = 0;
-       set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags);
        for (i = 0; i < dev->ext_vv_data->num_stds; i++)
                vfd->tvnorms |= dev->ext_vv_data->stds[i].id;
        strlcpy(vfd->name, name, sizeof(vfd->name));