aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaushir Patuck <naush@raspberrypi.com>2021-01-06 15:16:57 +0000
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2021-01-12 10:06:51 +0100
commitdb29c8d5cca97975440712ba43ed4bcd6556bcbf (patch)
tree7721cafd1811e0866a942a773bff20ffa10be805
parentecd07f4b9d2173694be9214a3ab07f9efb5ba206 (diff)
Revert "media: videobuf2: Fix length check for single plane dmabuf queueing"br-v5.11afor-v5.11a
The updated length check for dmabuf types broke existing usage in v4l2 userland clients. Fixes: 961d3b27 ("media: videobuf2: Fix length check for single plane dmabuf queueing") Cc: stable@vger.kernel.org Signed-off-by: Naushir Patuck <naush@raspberrypi.com> Tested-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-rw-r--r--drivers/media/common/videobuf2/videobuf2-v4l2.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c
index 96d3b2b2aa31..3f61f5863bf7 100644
--- a/drivers/media/common/videobuf2/videobuf2-v4l2.c
+++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c
@@ -118,8 +118,7 @@ static int __verify_length(struct vb2_buffer *vb, const struct v4l2_buffer *b)
return -EINVAL;
}
} else {
- length = (b->memory == VB2_MEMORY_USERPTR ||
- b->memory == VB2_MEMORY_DMABUF)
+ length = (b->memory == VB2_MEMORY_USERPTR)
? b->length : vb->planes[0].length;
if (b->bytesused > length)

Privacy Policy