From patchwork Thu Mar 1 15:27:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130301 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2953050edc; Thu, 1 Mar 2018 07:39:04 -0800 (PST) X-Google-Smtp-Source: AG47ELsYDMb25ObLkm5XwFssrTBEsnCCIk/nnvII7L8cY8duS2xWrjW13MZOe2oaPw5Lr7koZQcW X-Received: by 10.98.3.131 with SMTP id 125mr2364194pfd.65.1519918743947; Thu, 01 Mar 2018 07:39:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519918743; cv=none; d=google.com; s=arc-20160816; b=cDo5OnTlGhmRWw5ZhEqKbEGVwtiajz3I9lg+NFTIftiAUb88j0q77Kc8m5TYL+ECY2 /eKQD7do2dTe97ERz1kC2Bggz5StwSd+ZHKcz2OSRKsxNzfQlCRgaO5QVTAvmA/25qPk aaGowlCMMWzwgN7Q/zN00ZO/pxWsy2lPLCgl8ICVGRb3mQRDJ5ELR1seBPqTfVRIs18Y d7y180QdEy8h0s26qSoZuEpV7IPD5CRwcT0hNnFxAIyZUqKlMJ3DsGMV98GwYcXo7vAi qnkVxK3pSyPycH8Jd41RTnvXnVkplPtPqqYAzjo2q5zlD/bsS39oObxcEz2h64gFH4Va 0GnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=oIwh1u3qtAw0sZo+DDjuhmNNrn14Rowqwfug+xvfDbQ=; b=FJOms4v9LwzS2ADiKcWqDXMWmFqMl2y1hzcN5fLSBHNVWMKlsV0T+1l5P0NkpNLP28 uRyG6jsGJdjMeiKEEV4HVyNhMToRCXlY3aCSlqHJBAt/5m3ngRBJVt9XyLGYOaA7OPG5 CCAJL3XjkcSVEeevdbwhhOnp04kk/k+K83M5XkVd7Q00SCRwsA82eunOBIpGbE0TV21/ FDpwLpQnpCk+YL7PZr4pwNdu6fQkmRX7toeh28Zq9aQUJT1o8BVM1HARRjmkt0OJVrd1 6WvSKI3ynrm6uPlWi1timoXF9RenEtTAJocoRT4MGSsxwqnc1pLZzcyz451Nw1BK+VM4 51UA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=okAVYr0n; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b15si2586092pgs.318.2018.03.01.07.39.03; Thu, 01 Mar 2018 07:39:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=@microsoft.com header.s=selector1 header.b=okAVYr0n; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032481AbeCAPjB (ORCPT + 10 others); Thu, 1 Mar 2018 10:39:01 -0500 Received: from mail-bn3nam01on0130.outbound.protection.outlook.com ([104.47.33.130]:32096 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032574AbeCAPin (ORCPT ); Thu, 1 Mar 2018 10:38:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=oIwh1u3qtAw0sZo+DDjuhmNNrn14Rowqwfug+xvfDbQ=; b=okAVYr0nSWCijmp6dNcVSHL8BK0yOrcyOZewDWsNZSwA2n/zNznoD2tTWU9MWu3DaqAeSCFpSEjv5TNotjo3vcnecRWHxywWRaAjRke5I6hb9aCa0TckUGFxIM1cPE1Yzk35SRPTva9JCfTv0KVpJ1ercdbU7oAd5FPzkU9buHQ= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0902.namprd21.prod.outlook.com (52.132.132.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.567.2; Thu, 1 Mar 2018 15:38:40 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0567.006; Thu, 1 Mar 2018 15:38:40 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Arnd Bergmann , Mauro Carvalho Chehab , Sasha Levin Subject: [added to the 4.1 stable tree] [media] go7007: add MEDIA_CAMERA_SUPPORT dependency Thread-Topic: [added to the 4.1 stable tree] [media] go7007: add MEDIA_CAMERA_SUPPORT dependency Thread-Index: AQHTsXHS//4i9bp9SUK5VxUtnHQrug== Date: Thu, 1 Mar 2018 15:27:35 +0000 Message-ID: <20180301152116.1486-477-alexander.levin@microsoft.com> References: <20180301152116.1486-1-alexander.levin@microsoft.com> In-Reply-To: <20180301152116.1486-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB0902; 6:xrGKwtkRy5xmhUD5Rpxjf69q4lE2DfvcPCrbQlib1XMYJnkCmEmfvnLD685WeGrKvgPxM0O1HsLMX+LA24S0w3D1XqK909pVg0/3R0MKkXBdKeZAxINatTLFjHvNCVcpfhTy4n2xeGQdj5p/W+W3Mmxkwk39vD+ytwNz7htebaA1rB14zS8AIFbfgC6h9G8mXhcHMQz2oJm4YHiGJh2CWptk/uRdK0FXHWwir0ArOGALsGucFlsHax/uslzb/qwBthWR4lz40+U/gsf6CJLg8uenhsXIJC0QIraEAT0B3Xext6HnJ4+jklQrAYumx6VgcuQThCO5ACTPv0Lurvl+tgi1JkDFMXOwcowFMONZsycpkZ1MXU5jFeXrp9O76iVf; 5:4VecjvY1+EfFxTkrwf3o6Oq0dUiQkvPjsBBozQKxcEJTTGN/WbAiRbWzjWQ2PdITRW3qJjFqHXS419kmWots+2jgi8ZOKSJkrxq6nrcv3in3Neq9pJgyYaouHomj6ecUBfPJiC+SB8N5ufEpYg1WJZNAWhelshct9Oz7dSR4Qqo=; 24:HdqGi3h3nBAJZ0Nh5oleH5jOaJ+j+Xr6X+A+k2zuI13GOgnhDWxc70beYxivtWycZSVEClhE+bHKNCv8UOYmnS+WHb6ZKsSvgRRa7UI/PXI=; 7:nExrpZIhS83uvefUUUX41ZcQ/hHsTKYIVMoavhj8A2I67IOjO1nd+weWXlnKwJmu15tNchTYhPbPvZZ8BA2AVaWDI5hxWzLbuNQw+OqNQ2AYRSO4+gOVPWUQ+xR8zuMRZ28aVNQd0c8KIjTP+FmH6WBEvvkVH4w9bczr2eDF+vlAr/lgL7QoRkYyhuOY4xpFSrQQIQn9fbQmpt3K63Ew8dxrCttA6fAzb8Pfbb28gQh2EYcuEurlL6oXrh9HV6vY x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: d1316bd5-32cd-4b40-2ab4-08d57f8a81d2 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020); SRVR:DM5PR2101MB0902; x-ms-traffictypediagnostic: DM5PR2101MB0902: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(8121501046)(5005006)(3231220)(944501229)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM5PR2101MB0902; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0902; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(366004)(376002)(39380400002)(39860400002)(346002)(199004)(189003)(6116002)(72206003)(1076002)(3846002)(25786009)(2900100001)(36756003)(14454004)(316002)(3660700001)(6666003)(54906003)(110136005)(2950100002)(305945005)(7736002)(99286004)(5250100002)(86612001)(10090500001)(107886003)(66066001)(106356001)(2501003)(6512007)(6486002)(97736004)(6436002)(22452003)(68736007)(81166006)(8676002)(81156014)(53936002)(186003)(26005)(105586002)(3280700002)(8936002)(76176011)(478600001)(4326008)(10290500003)(86362001)(5660300001)(2906002)(6506007)(102836004)(59450400001)(6346003)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0902; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: FGbzSMyrwGysqR2Zkv1MVF+zz0rCNmZV8rQMNRycz/ziw1F1bc0MCAZjFdtKIipx4AjDIkMKO/b/40WaL7X8fGnBbq9FR0JHrN7ERyLGJt7uS7vKLUEv5qes3OdC2amflJ3zdgUBxzpw2z5azhvgIzQ/2oftKl2dHlUZLav5fOc= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: d1316bd5-32cd-4b40-2ab4-08d57f8a81d2 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:27:35.1647 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0902 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann This patch has been added to the 4.1 stable tree. If you have any objections, please let us know. -- 2.14.1 =============== [ Upstream commit fa6317eedd6341f2144ed1097706d8c34f18b6e4 ] If MEDIA_SUBDRV_AUTOSELECT and VIDEO_GO7007 are both set, we automatically select VIDEO_OV7640, but that depends on MEDIA_CAMERA_SUPPORT, so we get a Kconfig warning if that is disabled: warning: (VIDEO_GO7007) selects VIDEO_OV7640 which has unmet direct dependencies (MEDIA_SUPPORT && I2C && VIDEO_V4L2 && MEDIA_CAMERA_SUPPORT) This adds another dependency so we don't accidentally select it when it is unavailable. Signed-off-by: Arnd Bergmann Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/usb/go7007/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/usb/go7007/Kconfig b/drivers/media/usb/go7007/Kconfig index 95a3af644a92..af1d02430931 100644 --- a/drivers/media/usb/go7007/Kconfig +++ b/drivers/media/usb/go7007/Kconfig @@ -11,7 +11,7 @@ config VIDEO_GO7007 select VIDEO_TW2804 if MEDIA_SUBDRV_AUTOSELECT select VIDEO_TW9903 if MEDIA_SUBDRV_AUTOSELECT select VIDEO_TW9906 if MEDIA_SUBDRV_AUTOSELECT - select VIDEO_OV7640 if MEDIA_SUBDRV_AUTOSELECT + select VIDEO_OV7640 if MEDIA_SUBDRV_AUTOSELECT && MEDIA_CAMERA_SUPPORT select VIDEO_UDA1342 if MEDIA_SUBDRV_AUTOSELECT ---help--- This is a video4linux driver for the WIS GO7007 MPEG