lkml.org 
[lkml]   [2019]   [Jan]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 07/51] media: em28xx: Fix misplaced reset of dev->v4l::field_count
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    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
    @@ -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

    \
     
     \ /
      Last update: 2019-01-21 14:56    [W:3.534 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site