3.18-stable patches

added patches:
	media-em28xx-fix-misplaced-reset-of-dev-v4l-field_count.patch

diff --git a/queue-3.18/media-em28xx-fix-misplaced-reset-of-dev-v4l-field_count.patch b/queue-3.18/media-em28xx-fix-misplaced-reset-of-dev-v4l-field_count.patch
new file mode 100644 (file)
index 0000000..932fea5
--- /dev/null
+++ b/queue-3.18/media-em28xx-fix-misplaced-reset-of-dev-v4l-field_count.patch
@@ -0,0 +1,44 @@
+From ben@decadent.org.uk  Fri Jan 18 17:00:31 2019
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Thu, 17 Jan 2019 00:22:48 +0000
+Subject: media: em28xx: Fix misplaced reset of dev->v4l::field_count
+To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: stable@vger.kernel.org, Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Message-ID: <20190117002247.6w6az3v5unwwq57b@decadent.org.uk>
+Content-Disposition: inline
+
+From: Ben Hutchings <ben@decadent.org.uk>
+
+The backport of commit afeaade90db4 "media: em28xx: make
+v4l2-compliance happier by starting sequence on zero" added a
+reset on em28xx_v4l2::field_count to em28xx_ctrl_notify(),
+but it should be done in em28xx_start_analog_streaming().
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Cc: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/media/usb/em28xx/em28xx-video.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/media/usb/em28xx/em28xx-video.c
++++ b/drivers/media/usb/em28xx/em28xx-video.c
+@@ -931,6 +931,8 @@ int em28xx_start_analog_streaming(struct
+ 
+       em28xx_videodbg("%s\n", __func__);
+ 
++      dev->v4l2->field_count = 0;
++
+       /* Make sure streaming is not already in progress for this type
+          of filehandle (e.g. video, vbi) */
+       rc = res_get(dev, vq->type);
+@@ -1141,8 +1143,6 @@ static void em28xx_ctrl_notify(struct v4
+ {
+       struct em28xx *dev = priv;
+ 
+-      dev->v4l2->field_count = 0;
+-
+       /*
+        * In the case of non-AC97 volume controls, we still need
+        * to do some setups at em28xx, in order to mute/unmute

diff --git a/queue-3.18/series b/queue-3.18/series
index 6ed8f4d7deb22ec7f1d5e8b8b7bdaa1f1c4d4d09..811ebc849355ed7b2b7306c7e51320b1272f7f5e 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -11,3 +11,4 @@ crypto-cts-fix-crash-on-short-inputs.patch
 sunrpc-use-after-free-in-svc_process_common.patch
 tty-ldsem-wake-up-readers-after-timed-out-down_write.patch
 can-gw-ensure-dlc-boundaries-after-can-frame-modification.patch
+media-em28xx-fix-misplaced-reset-of-dev-v4l-field_count.patch