From: Greg Kroah-Hartman Date: Fri, 18 Jan 2019 16:05:40 +0000 (+0100) Subject: 4.9-stable patches X-Git-Tag: v4.20.4~49 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5ea87b8fbdbb61ad129167d07b97bd2b5918c28;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: media-em28xx-fix-misplaced-reset-of-dev-v4l-field_count.patch --- diff --git a/queue-4.9/media-em28xx-fix-misplaced-reset-of-dev-v4l-field_count.patch b/queue-4.9/media-em28xx-fix-misplaced-reset-of-dev-v4l-field_count.patch new file mode 100644 index 00000000000..7d141bb1aec --- /dev/null +++ b/queue-4.9/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 +Date: Thu, 17 Jan 2019 00:22:48 +0000 +Subject: media: em28xx: Fix misplaced reset of dev->v4l::field_count +To: Greg Kroah-Hartman +Cc: stable@vger.kernel.org, Mauro Carvalho Chehab +Message-ID: <20190117002247.6w6az3v5unwwq57b@decadent.org.uk> +Content-Disposition: inline + +From: Ben Hutchings + +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 +Cc: Mauro Carvalho Chehab +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -1062,6 +1062,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); +@@ -1290,8 +1292,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-4.9/series b/queue-4.9/series index 3b4884e13c8..b5491c25c0f 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -4,3 +4,4 @@ tty-simplify-tty-count-math-in-tty_reopen.patch tty-don-t-hold-ldisc-lock-in-tty_reopen-if-ldisc-present.patch can-gw-ensure-dlc-boundaries-after-can-frame-modification.patch revert-f2fs-do-not-recover-from-previous-remained-wrong-dnodes.patch +media-em28xx-fix-misplaced-reset-of-dev-v4l-field_count.patch