[PATCH 4.14] media: em28xx: Fix misplaced reset of dev->v4l::field_count

[PATCH 4.14] media: em28xx: Fix misplaced reset of dev->v4l::field_count

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 1314 bytes --]

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_enable_analog_tuner()
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>
---
 drivers/media/usb/em28xx/em28xx-video.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index 92a74bc34527..bd8de78e0ffd 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -900,8 +900,6 @@ static int em28xx_enable_analog_tuner(struct em28xx *dev)
 	if (!mdev || !v4l2->decoder)
 		return 0;
 
-	dev->v4l2->field_count = 0;
-
 	/*
 	 * This will find the tuner that is connected into the decoder.
 	 * Technically, this is not 100% correct, as the device may be
@@ -1074,6 +1072,8 @@ int em28xx_start_analog_streaming(struct vb2_queue *vq, unsigned int count)
 
 	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);

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 4.14] media: em28xx: Fix misplaced reset of dev->v4l::field_count

[Greg Kroah-Hartman]

On Thu, Jan 17, 2019 at 12:25:58AM +0000, Ben Hutchings wrote:
> 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_enable_analog_tuner()
> 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>
> ---
>  drivers/media/usb/em28xx/em28xx-video.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Thanks, now queued up.

greg k-h