Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp6257095imu; Mon, 21 Jan 2019 05:59:03 -0800 (PST) X-Google-Smtp-Source: ALg8bN5nI24unLjPUTEwH1iGm0r8XCDxR8bmTp5Pbcrn/y1Fp3JR9nwg4BU9nCXXE62bk4PnoNNG X-Received: by 2002:a17:902:a03:: with SMTP id 3mr30460035plo.112.1548079143583; Mon, 21 Jan 2019 05:59:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548079143; cv=none; d=google.com; s=arc-20160816; b=Z4K8kaytoyHIVd5XqHpWiWG1yXS6Irj+bWx1pM2wk9NUFH9GN4Vy7f5R/MdZjQYxe4 H+8m2nqC9O8it500wZtq6UqcGrvA1nDq3AyDagUUgWnqEJqQDSwF/WVjVNE7ikP2XHYN jNF99Hni9UCq1vGx2xGzQJOHTTooLCK8TXpKpQxq/AetBvjxr8lD6g6T25sWQ7z4ulB4 zEI+MI9HKaPkwBOJAPTbWUYM8u4TarJZswdgrmh2VluVPRRecy6129AoeGb2CRRsNBqV W5czID1W3tKd1WbuX1a3Zx5nUmFUlQ5cYQspwHEhC4IaFFE6w/DC3bObSIsxRqZqlgRp MudA== 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=zCW1gsLsBYQoLnD/H5vhc4Z879o62HixbEzOrxdF/xo=; b=c1rAigVrLQFmuzaiCAk1ImjmcxNz1Lm+CHEpq5wsJ7sCpXJUraLn+FrBjmKYH1Liob GgOi0kRYpNnijued1fKzsQOXWJQ8zJwnIPf4LJiqOwTzY9P3s3dn28cIWttBiEYClzLH jShvl5DcpvM2RPvWwep/EuvqDOqncskE87UqPCJK7gOzbRorh4uhFheogwHwIGr3c0S8 gkclxPt8UAE40jw7V6vgkgW7Qkw5TERvgs1CnjxiHOsW7s/M2ixCQsHKYmtb35LN1rwZ M46YEXfZi+6c+HVBtzffnlXpMvzQVa0VT0sGGB91CKPVPh+CajO81pgftC4MFX+5g0Xk QPIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=lB1iUmpV; 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 g7si12464673plq.336.2019.01.21.05.58.48; Mon, 21 Jan 2019 05:59:03 -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=lB1iUmpV; 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 S1731764AbfAUNzn (ORCPT + 99 others); Mon, 21 Jan 2019 08:55:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:40444 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731749AbfAUNzk (ORCPT ); Mon, 21 Jan 2019 08:55:40 -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 5088120861; Mon, 21 Jan 2019 13:55:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548078939; bh=Z7L+O5Ra7KHCdWrph5I/mmEJOznmY+OgYNWdwu96ucI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lB1iUmpVbDawPbYcdeSFsXP/FjyA7ppOyo1TfP5avQClNezKgpZ7AkFPkbZBiVX8c vva/RmrjdxEiohr+VfDGLZhlmcqsC1auoFQgxQZs3iGmnNebtOUdWSE5PB5bCCHeBk x5uPSeRjedXiaDo9RNOI7ZeyzYURa2PT1TJfIsvk= 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.9 07/51] media: em28xx: Fix misplaced reset of dev->v4l::field_count Date: Mon, 21 Jan 2019 14:44:03 +0100 Message-Id: <20190121122454.154518807@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190121122453.700446926@linuxfoundation.org> References: <20190121122453.700446926@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.9-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 @@ -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