Commit 03ac3479 authored by Ben Hutchings's avatar Ben Hutchings Committed by Stefan Bader

media: em28xx: Fix misplaced reset of dev->v4l::field_count

BugLink: https://bugs.launchpad.net/bugs/1818797

The backport of commit afeaade9 "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: default avatarBen Hutchings <ben@decadent.org.uk>
Cc: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJuerg Haefliger <juergh@canonical.com>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
parent 8f86715a
...@@ -930,6 +930,8 @@ int em28xx_start_analog_streaming(struct vb2_queue *vq, unsigned int count) ...@@ -930,6 +930,8 @@ int em28xx_start_analog_streaming(struct vb2_queue *vq, unsigned int count)
em28xx_videodbg("%s\n", __func__); em28xx_videodbg("%s\n", __func__);
dev->v4l2->field_count = 0;
/* Make sure streaming is not already in progress for this type /* Make sure streaming is not already in progress for this type
of filehandle (e.g. video, vbi) */ of filehandle (e.g. video, vbi) */
rc = res_get(dev, vq->type); rc = res_get(dev, vq->type);
...@@ -1149,8 +1151,6 @@ static void em28xx_ctrl_notify(struct v4l2_ctrl *ctrl, void *priv) ...@@ -1149,8 +1151,6 @@ static void em28xx_ctrl_notify(struct v4l2_ctrl *ctrl, void *priv)
{ {
struct em28xx *dev = priv; struct em28xx *dev = priv;
dev->v4l2->field_count = 0;
/* /*
* In the case of non-AC97 volume controls, we still need * In the case of non-AC97 volume controls, we still need
* to do some setups at em28xx, in order to mute/unmute * to do some setups at em28xx, in order to mute/unmute
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment