]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
media: videobuf2-v4l2: drop WARN_ON in vb2_warn_zero_bytesused()
authorHans Verkuil <hverkuil-cisco@xs4all.nl>
Mon, 19 Nov 2018 15:33:44 +0000 (10:33 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 23 Mar 2019 19:09:38 +0000 (20:09 +0100)
commit 5e99456c20f712dcc13d9f6ca4278937d5367355 upstream.

Userspace shouldn't set bytesused to 0 for output buffers.
vb2_warn_zero_bytesused() warns about this (only once!), but it also
calls WARN_ON(1), which is confusing since it is not immediately clear
that it warns about a 0 value for bytesused.

Just drop the WARN_ON as it serves no purpose.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Cc: Matthias Maennich <maennich@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/media/common/videobuf2/videobuf2-v4l2.c

index 886a2d8d5c6c424790ecc13874e9ba4949c1161a..9d4a81bb0e5970e97fb56258cc8ed8dccd8fad4d 100644 (file)
@@ -145,7 +145,6 @@ static void vb2_warn_zero_bytesused(struct vb2_buffer *vb)
                return;
 
        check_once = true;
-       WARN_ON(1);
 
        pr_warn("use of bytesused == 0 is deprecated and will be removed in the future,\n");
        if (vb->vb2_queue->allow_zero_bytesused)