From patchwork Mon Aug 17 15:13:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 247810 Delivered-To: patch@linaro.org Received: by 2002:a92:cc90:0:0:0:0:0 with SMTP id x16csp2745218ilo; Mon, 17 Aug 2020 08:48:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzY96HnEvppkeQe6dyLV5Mfl6bMJnv2exj1ib4jDNd/0NW8hfGdd/WX6eDdMn2q9aKNOZAk X-Received: by 2002:a17:906:a3d9:: with SMTP id ca25mr15939740ejb.164.1597679297133; Mon, 17 Aug 2020 08:48:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597679297; cv=none; d=google.com; s=arc-20160816; b=m33pF5CqRoTLbonZNztlfM4PF/zNU1aCaCl9ZT8bCWed0cczF2osZpzYyRDQYfDxLe DUJ9A+SP+c45R3MxbU3DJvmdpwPDg4beARyUX6ef8C63ljNYfwnqReCSlPg0HsHS2b9n B35E2hON+0xnH6rgZ5ohD9cnAmgaMqiCr3pcIYaVkhp8fHdHhSIcb8GWeGof/4C3wuq6 iwMOU3qFG/o6kCJvBTjlz3xdgwvDWnNjYbAX1NUt4PJyq28z/fs/shlwdTT09+Lj/WBj cAxunxYh4LJ1Iesl8ctPxRk6O7WvxUCI2Ym0GIpojcondn7al0U+6tNvgyiAZwOXullD ckJQ== 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=wiCTK/pPHYxOLbrPIKaCqHJ2c33JMoaRuXDgV36Gnng=; b=uD/eGvI/x/lJ0lMPir2ecZCJVuH0hUG5X/GgJIJF1de/tLyOsBcyOsPXZkeRascH48 yECDz97KJZuugVteTVQrMmkzI5XS19aW8cVlmS6/nv9QxXMBNJhsuW3AY2mAHhK9mGEl xo6VpfRKtjwOY07ivZu0RDMmuVgyXN4+P12JkMzh/S/pw5BQ6UKmiuxMEsaZf0S4kjm8 8g1qZCKZ3im/mS93TNXq1n3Mnmj9p8QqO48NVtlMxhNRHf4ZaLie6l4idyxrOiOxCg53 vI08RuDwpjG6LL4QHjKBZglPrfa/Gp5I6OlMZsW/31ftD1Vttt9A8Ocr4574LX+M4Gah Ureg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HEQ6p4f1; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ot41si1748226ejb.173.2020.08.17.08.48.16; Mon, 17 Aug 2020 08:48:17 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HEQ6p4f1; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730828AbgHQPsK (ORCPT + 15 others); Mon, 17 Aug 2020 11:48:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:59876 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730308AbgHQPrt (ORCPT ); Mon, 17 Aug 2020 11:47:49 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 8FA552177B; Mon, 17 Aug 2020 15:47:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597679269; bh=7CMovI0zAwuBI0lGbchrtjjutgyxnMT1+5oXz6Mpy1Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HEQ6p4f18uQTBEua3XI7GHWYJGJk3FCCD20UAzw9zu0g+GWn5R8rcZDruET7oP9oJ cOQDsACyoZoyj0MANyiwiKXwV40eGrzx/ZeM+qwXxvIxBquHLJJQhR+ZiDhPiI154V kCypU1eZzgJ+/+PZ9t0ShkwttuVfa0BQ/6R0n4eE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Sean Young , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.7 152/393] media: cxusb-analog: fix V4L2 dependency Date: Mon, 17 Aug 2020 17:13:22 +0200 Message-Id: <20200817143826.989351277@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143819.579311991@linuxfoundation.org> References: <20200817143819.579311991@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit 1a55caf010c46d4f2073f9e92e97ef65358c16bf ] CONFIG_DVB_USB_CXUSB_ANALOG is a 'bool' symbol with a dependency on the tristate CONFIG_VIDEO_V4L2, which means it can be enabled as =y even when its dependency is =m. This leads to a link failure: drivers/media/usb/dvb-usb/cxusb-analog.o: In function `cxusb_medion_analog_init': cxusb-analog.c:(.text+0x92): undefined reference to `v4l2_subdev_call_wrappers' drivers/media/usb/dvb-usb/cxusb-analog.o: In function `cxusb_medion_register_analog': cxusb-analog.c:(.text+0x466): undefined reference to `v4l2_device_register' cxusb-analog.c:(.text+0x4c3): undefined reference to `v4l2_i2c_new_subdev' cxusb-analog.c:(.text+0x4fb): undefined reference to `v4l2_subdev_call_wrappers' ... Change the dependency only disallow the analog portion of the driver in that configuration. Fixes: e478d4054054 ("media: cxusb: add analog mode support for Medion MD95700") Signed-off-by: Arnd Bergmann Signed-off-by: Sean Young Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/usb/dvb-usb/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.25.1 diff --git a/drivers/media/usb/dvb-usb/Kconfig b/drivers/media/usb/dvb-usb/Kconfig index 1a3e5f965ae40..2d7a5c1c84af6 100644 --- a/drivers/media/usb/dvb-usb/Kconfig +++ b/drivers/media/usb/dvb-usb/Kconfig @@ -150,6 +150,7 @@ config DVB_USB_CXUSB config DVB_USB_CXUSB_ANALOG bool "Analog support for the Conexant USB2.0 hybrid reference design" depends on DVB_USB_CXUSB && VIDEO_V4L2 + depends on VIDEO_V4L2=y || VIDEO_V4L2=DVB_USB_CXUSB select VIDEO_CX25840 select VIDEOBUF2_VMALLOC help