| From 684cdaa3ab9ceedd84700008d0bc3bbee4c1aa55 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 7 May 2020 23:33:14 +0200 |
| Subject: media: cxusb-analog: fix V4L2 dependency |
| |
| From: Arnd Bergmann <arnd@arndb.de> |
| |
| [ 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 <arnd@arndb.de> |
| Signed-off-by: Sean Young <sean@mess.org> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/usb/dvb-usb/Kconfig | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| 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 |
| -- |
| 2.25.1 |
| |
