Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2404210imu; Thu, 24 Jan 2019 12:10:40 -0800 (PST) X-Google-Smtp-Source: ALg8bN5BcMBgM/DX6T798TIhEgRAUn6fga+LVXwSnnN6JaU1pfZZDAtG+ApP4vF9WUjD+5oM1duW X-Received: by 2002:a63:4b60:: with SMTP id k32mr7205767pgl.186.1548360640503; Thu, 24 Jan 2019 12:10:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548360640; cv=none; d=google.com; s=arc-20160816; b=PUqVRlSrRo4vLgsB/ilVBvXHXfgVgnPpG88LofXqEYASXCgc2NTZWz+6gZwetg1HAK 1z22VyyX/o3vAKoWqrj+6r/iO0rs6Kn7F3aglaTR2ogSJ3cRLsIJ6fVpfdZnpPQClJro sxHegReokOIEHpyVDZIow5xgXSK9N1aEBya5qbj4hTzXJHl0BjhNSgFtB5w/XaMV6LTN V30eD2QQEURYbIJKE3Kfz1Nupuz7kBp39yCaf0EJK9Ir5Gn/eXwlpTXbz5As1IQWV6Zl YYNaHZCC0G+od7kSs9WkqeUfFtNoV+ovT6qqrSlEHQoH8BvESkXCSvpbievURg3Nsx1o idGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=unQHGhjQhDeasn+/XU0L4256quF4KqIQEMo7/sDVCc8=; b=szfbZLUyZN9AKcLZZNpwXpIH96opWMdqdbBlNzLGTpbhYfuJtylhHmeE20/1A65g93 Wg+WQUIU4kcPtKGkgkEKpwQsqv8TeUOOtQXUWm75+OVIUoTWwxFLF09Jb36KbsaUg1ZE ueX4kYqQ/npF2nbYNPsgK/IbWZJ17d+Tt4CGideGZOgyPxzdXGxnJVvGaFvewLdZETXQ lS08omDuVuYc6J6Lu06N9DCFN2H2Qz28uyljOwZlXDWmYRhPw/G01SvJLCLVZyZjAdtN IiRqjGeENQQwtHjH0bNwwynsvHXdXE2LTd08sCQXl7nQ6lrjLGPexNjusl9iVNqJLF/k H7AQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=PgeUmLB5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h36si2720718pgm.200.2019.01.24.12.10.24; Thu, 24 Jan 2019 12:10:40 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=PgeUmLB5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730835AbfAXT1w (ORCPT + 99 others); Thu, 24 Jan 2019 14:27:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:54112 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730095AbfAXT1r (ORCPT ); Thu, 24 Jan 2019 14:27:47 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 71B3E218FC; Thu, 24 Jan 2019 19:27:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548358066; bh=PR8Uj7RtjtuHLjbGj7FEKAT29hapuyKdVWpCZ6/iTSU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PgeUmLB5lFk8kfwbVusFyJh+zjg8KzIEz2wSF7BZwnzonJkSP3FKZx04lysFcchZp 9TG5K6LrwzQ5YzrXcRHD4XE20azlCV/F7iJ1W5lf2qkf67NpBYkSpRBEN6KIRb3IWY IN0dWUcMJh94bQI31ViVIpHer+oe0Fh+Fi1RzpxI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "stable@vger.kernel.org, Mauro Carvalho Chehab" , Ben Hutchings , Mauro Carvalho Chehab Subject: [PATCH 4.4 038/104] media: em28xx: Fix misplaced reset of dev->v4l::field_count Date: Thu, 24 Jan 2019 20:19:27 +0100 Message-Id: <20190124190159.417304107@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190124190154.968308875@linuxfoundation.org> References: <20190124190154.968308875@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ 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 @@ -930,6 +930,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); @@ -1149,8 +1151,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