renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-17 18:14:34 +08:00
Code

[media] media: blackfin: bfin_capture: set vb2 buffer field

Browse Source 
set the vb2 buffer field in buf_prepare() callback,
alongside drop local variable buf as we already have
a pointer to vb2 buffer.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Tested-by: Scott Jiang <scott.jiang.linux@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Lad, Prabhakar 2015-03-08 11:40:40 -03:00 committed by Mauro Carvalho Chehab
parent 5f65ca81c3
commit cd3c38effc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/platform/blackfin/bfin_capture.c
View File

@ -305,16 +305,16 @@ static int bcap_queue_setup(struct vb2_queue *vq,
static int bcap_buffer_prepare(struct vb2_buffer *vb) static int bcap_buffer_prepare(struct vb2_buffer *vb)
{ {
struct bcap_device *bcap_dev = vb2_get_drv_priv(vb->vb2_queue); struct bcap_device *bcap_dev = vb2_get_drv_priv(vb->vb2_queue);
struct bcap_buffer *buf = to_bcap_vb(vb); unsigned long size = bcap_dev->fmt.sizeimage;
unsigned long size;
size = bcap_dev->fmt.sizeimage;
if (vb2_plane_size(vb, 0) < size) { if (vb2_plane_size(vb, 0) < size) {
v4l2_err(&bcap_dev->v4l2_dev, "buffer too small (%lu < %lu)\n", v4l2_err(&bcap_dev->v4l2_dev, "buffer too small (%lu < %lu)\n",
vb2_plane_size(vb, 0), size); vb2_plane_size(vb, 0), size);
return -EINVAL; return -EINVAL;
} }
vb2_set_plane_payload(&buf->vb, 0, size); vb2_set_plane_payload(vb, 0, size);
vb->v4l2_buf.field = bcap_dev->fmt.field;
return 0; return 0;
} }