From: Naushir Patuck <naush@raspberrypi.com>
To: linux-media@vger.kernel.org
Cc: laurent.pinchart@ideasonboard.com,
Naushir Patuck <naush@raspberrypi.com>
Subject: [PATCH] Revert "media: videobuf2: Fix length check for single plane dmabuf queueing"
Date: Wed, 6 Jan 2021 13:52:11 +0000 [thread overview]
Message-ID: <20210106135210.12337-1-naush@raspberrypi.com> (raw)
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")
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
---
drivers/media/common/videobuf2/videobuf2-v4l2.c | 3 +--
1 file changed, 1 insertion(+), 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)
--
2.25.1
next reply other threads:[~2021-01-06 13:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-06 13:52 Naushir Patuck [this message]
2021-01-06 14:35 ` [PATCH] Revert "media: videobuf2: Fix length check for single plane dmabuf queueing" Kieran Bingham
2021-01-06 14:42 ` Laurent Pinchart
2021-01-06 14:50 ` Kieran Bingham
2021-01-06 15:16 ` [PATCH v2] " Naushir Patuck
2021-01-06 15:25 ` Laurent Pinchart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210106135210.12337-1-naush@raspberrypi.com \
--to=naush@raspberrypi.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox