Commit 95e9295d authored by Naushir Patuck's avatar Naushir Patuck Committed by Mauro Carvalho Chehab
Browse files

media: Revert "media: videobuf2: Fix length check for single plane dmabuf queueing" 



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: default avatarNaushir Patuck <naush@raspberrypi.com>
Tested-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Reviewed-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent e1def45b

drivers/media/common/videobuf2/videobuf2-v4l2.c

+1 −2
Original line number Diff line number Diff line
@@ -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)