diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-07-17 14:27:39 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-21 18:32:35 -0400 |
commit | c9adcb73b2da5eddfcb96bfa264bb61b6b83ac96 (patch) | |
tree | 03e5a340017ffaee62c184c30a4bb92b44ec96ab /drivers/media/common | |
parent | 7fcec4c14b15684b0853c9ebc4090c19adc9a1f6 (diff) |
[media] saa7146: fix compile warning
Fall-out from the recent struct v4l2_framebuffer change.
drivers/media/common/saa7146/saa7146_fops.c: In function ‘saa7146_vv_init’:
drivers/media/common/saa7146/saa7146_fops.c:536:6: warning: assignment from incompatible pointer type [enabled by default]
fmt = &vv->ov_fb.fmt;
^
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/common')
-rw-r--r-- | drivers/media/common/saa7146/saa7146_fops.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/media/common/saa7146/saa7146_fops.c b/drivers/media/common/saa7146/saa7146_fops.c index f2cc521e3743..d9e1d6395ed9 100644 --- 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) | |||
533 | if (dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE) | 533 | if (dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE) |
534 | saa7146_vbi_uops.init(dev,vv); | 534 | saa7146_vbi_uops.init(dev,vv); |
535 | 535 | ||
536 | fmt = &vv->ov_fb.fmt; | 536 | vv->ov_fb.fmt.width = vv->standard->h_max_out; |
537 | fmt->width = vv->standard->h_max_out; | 537 | vv->ov_fb.fmt.height = vv->standard->v_max_out; |
538 | fmt->height = vv->standard->v_max_out; | 538 | vv->ov_fb.fmt.pixelformat = V4L2_PIX_FMT_RGB565; |
539 | fmt->pixelformat = V4L2_PIX_FMT_RGB565; | 539 | vv->ov_fb.fmt.bytesperline = 2 * vv->ov_fb.fmt.width; |
540 | fmt->bytesperline = 2 * fmt->width; | 540 | vv->ov_fb.fmt.sizeimage = vv->ov_fb.fmt.bytesperline * vv->ov_fb.fmt.height; |
541 | fmt->sizeimage = fmt->bytesperline * fmt->height; | 541 | vv->ov_fb.fmt.colorspace = V4L2_COLORSPACE_SRGB; |
542 | fmt->colorspace = V4L2_COLORSPACE_SRGB; | ||
543 | 542 | ||
544 | fmt = &vv->video_fmt; | 543 | fmt = &vv->video_fmt; |
545 | fmt->width = 384; | 544 | fmt->width = 384; |