summaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorHans Verkuil2018-06-03 11:00:25 +0200
committerMauro Carvalho Chehab2018-08-31 17:15:32 +0200
commit559cd0a3e4848050810d125ffba36dab1e686c9d (patch)
tree764e262da549cd8ac9f0c9cab0517f81cbbef151 /drivers/staging
parentmedia: vb2: store userspace data in vb2_v4l2_buffer (diff)
downloadkernel-qcow2-linux-559cd0a3e4848050810d125ffba36dab1e686c9d.tar.gz
kernel-qcow2-linux-559cd0a3e4848050810d125ffba36dab1e686c9d.tar.xz
kernel-qcow2-linux-559cd0a3e4848050810d125ffba36dab1e686c9d.zip
media: davinci_vpfe: remove bogus vb2->state check
There is no need to check the vb2 state in the buf_prepare callback: it can never be wrong. Since VB2_BUF_STATE_PREPARED will be removed in the next patch we'll remove this unnecessary check (and use of that state) first. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Reviewed-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/media/davinci_vpfe/vpfe_video.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c
index 1269a983455e..4e3ec7fdc90d 100644
--- a/drivers/staging/media/davinci_vpfe/vpfe_video.c
+++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c
@@ -1135,10 +1135,6 @@ static int vpfe_buffer_prepare(struct vb2_buffer *vb)
v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_buffer_prepare\n");
- if (vb->state != VB2_BUF_STATE_ACTIVE &&
- vb->state != VB2_BUF_STATE_PREPARED)
- return 0;
-
/* Initialize buffer */
vb2_set_plane_payload(vb, 0, video->fmt.fmt.pix.sizeimage);
if (vb2_plane_vaddr(vb, 0) &&