From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 19 Mar 2019 14:56:06 +0000 (+0100)
Subject: 4.9-stable patches
X-Git-Tag: v3.18.137~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a43ae82121ef04ee310a7325c2343aa60f2508ef;p=thirdparty%2Fkernel%2Fstable-queue.git

4.9-stable patches

added patches:
	media-videobuf2-v4l2-drop-warn_on-in-vb2_warn_zero_bytesused.patch
---

diff --git a/queue-4.14/series b/queue-4.14/series
new file mode 100644
index 00000000000..3d87219b539
--- /dev/null
+++ b/queue-4.14/series
@@ -0,0 +1 @@
+media-videobuf2-v4l2-drop-warn_on-in-vb2_warn_zero_bytesused.patch
diff --git a/queue-4.19/series b/queue-4.19/series
new file mode 100644
index 00000000000..3d87219b539
--- /dev/null
+++ b/queue-4.19/series
@@ -0,0 +1 @@
+media-videobuf2-v4l2-drop-warn_on-in-vb2_warn_zero_bytesused.patch
diff --git a/queue-4.9/media-videobuf2-v4l2-drop-warn_on-in-vb2_warn_zero_bytesused.patch b/queue-4.9/media-videobuf2-v4l2-drop-warn_on-in-vb2_warn_zero_bytesused.patch
new file mode 100644
index 00000000000..2a009d3a3b5
--- /dev/null
+++ b/queue-4.9/media-videobuf2-v4l2-drop-warn_on-in-vb2_warn_zero_bytesused.patch
@@ -0,0 +1,36 @@
+From 5e99456c20f712dcc13d9f6ca4278937d5367355 Mon Sep 17 00:00:00 2001
+From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
+Date: Mon, 19 Nov 2018 10:33:44 -0500
+Subject: media: videobuf2-v4l2: drop WARN_ON in vb2_warn_zero_bytesused()
+
+From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
+
+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/v4l2-core/videobuf2-v4l2.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/media/v4l2-core/videobuf2-v4l2.c
++++ b/drivers/media/v4l2-core/videobuf2-v4l2.c
+@@ -146,7 +146,6 @@ static void vb2_warn_zero_bytesused(stru
+ 		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)
diff --git a/queue-4.9/series b/queue-4.9/series
new file mode 100644
index 00000000000..3d87219b539
--- /dev/null
+++ b/queue-4.9/series
@@ -0,0 +1 @@
+media-videobuf2-v4l2-drop-warn_on-in-vb2_warn_zero_bytesused.patch
diff --git a/queue-5.0/series b/queue-5.0/series
new file mode 100644
index 00000000000..e69de29bb2d