Received: by 10.223.185.116 with SMTP id b49csp6432793wrg; Wed, 28 Feb 2018 09:18:13 -0800 (PST) X-Google-Smtp-Source: AH8x227Reh0ct34CzMkny6VS1pDpH/h/YenO3mbQQKsCYWB93CzWVuGbXclFc0VI54wwKqE9zFaX X-Received: by 10.99.104.73 with SMTP id d70mr14660412pgc.107.1519838293208; Wed, 28 Feb 2018 09:18:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519838293; cv=none; d=google.com; s=arc-20160816; b=w1vMXJb5Fzr3hvuNLHiNeHbXtrcgi+Hiv9U+20ZJJADuY2xauMc15FrGbVDXKMvxfo rr1fHleNkAKv/rrY3sMLBXeGbEOYuVw2XWxOCMdLnRGjlD/0F0/vN2Yr08BFtaRQqTHU ZJworT+cnuGfJ1DB70nQlWDGDa4zuQEIQZfuSLEgQI2Wzi8dzTr7gndQQO35uJSKvgfN 4Ua2ZmC0w/0B8sA2Eai5ZyR1M2a1Gstw0MuDa+lpmy651eh4wSi+IsjDVgFn+e1CxIQS CzDQNORo3m1JsPNVP7UPtUYi6X2qs4pFSLy17VrKXpXTAg+xlZMyvLUfCuLZA81aFl5A iXtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:subject:message-id:date:cc:to :from:mime-version:content-transfer-encoding:content-disposition :arc-authentication-results; bh=o3n/5qqWgQQweeAM+qRz1M4E5cDkiGhvfJDgBV8pnT8=; b=wAogn7IUWtHaQXM6CoBKYCqLDKJpEnkJniLudJkxGm06IKkOdS3TBldImE9c8HJDCi agtwUofmJKwktAs8/b+OwpL5x3ZawqqJmx89NYjR4tqpfNPM8cohdXsauzNfn3vTt9+r zdi77yp1XkTWOydHhxlxNPxglYihksfC7S9D3K3QSJ8Ao5ecPGvJRGVNJMh28bmXbzGi 9kGK0ehO9w2JxhprduiIudoKIQ7D1hvyBEa4wwvdKmc93JS16hROYh31DHLr5gNn3ffs j72cvQ2KSk0lyAHzcdo3m6XzYlMcZQRT8we/D9HqThuZ2Nm4QmzVeUXzrgcZFi+xf1Qa yEnQ== ARC-Authentication-Results: i=1; mx.google.com; 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 f5si1232944pgv.476.2018.02.28.09.17.57; Wed, 28 Feb 2018 09:18:13 -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; 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 S933524AbeB1PsP (ORCPT + 99 others); Wed, 28 Feb 2018 10:48:15 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:34243 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933190AbeB1PsM (ORCPT ); Wed, 28 Feb 2018 10:48:12 -0500 Received: from [2a02:8011:400e:2:6f00:88c8:c921:d332] (helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1er3Ym-0006XU-EW; Wed, 28 Feb 2018 15:22:25 +0000 Received: from ben by deadeye with local (Exim 4.90_1) (envelope-from ) id 1er3Yk-0000J5-QE; Wed, 28 Feb 2018 15:22:22 +0000 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Hans Verkuil" , "Hans Verkuil" , "Mauro Carvalho Chehab" Date: Wed, 28 Feb 2018 15:20:18 +0000 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.16 238/254] media: v4l2-compat-ioctl32.c: add capabilities field to, v4l2_input32 In-Reply-To: X-SA-Exim-Connect-IP: 2a02:8011:400e:2:6f00:88c8:c921:d332 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.55-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Hans Verkuil commit 037e0865c2ecbaa4558feba239ece08d7e457ec0 upstream. The v4l2_input32 struct wasn't updated when this field was added. It didn't cause a failure in the compat code, but it is better to keep it in sync with v4l2_input to avoid confusion. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Ben Hutchings --- drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c @@ -576,7 +576,8 @@ struct v4l2_input32 { __u32 tuner; /* Associated tuner */ compat_u64 std; __u32 status; - __u32 reserved[4]; + __u32 capabilities; + __u32 reserved[3]; }; /* The 64-bit v4l2_input struct has extra padding at the end of the struct.