From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753104AbeADNoI (ORCPT + 1 other); Thu, 4 Jan 2018 08:44:08 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:60653 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752469AbeADNoH (ORCPT ); Thu, 4 Jan 2018 08:44:07 -0500 From: Arnd Bergmann To: Mauro Carvalho Chehab Cc: Arnd Bergmann , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [v2] media: au0828: fix VIDEO_V4L2 dependency Date: Thu, 4 Jan 2018 14:43:50 +0100 Message-Id: <20180104134401.2642255-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:RH/PR2kwnTti1uIx370RCcsxQo8CvUihCln3+3E5BYDultqJSd1 MmoScmHoRwPMLb+eYTlX0bBLoh7oxcIra2p2aHlp/+T2lCQF4f/Juu8sYubBMteenIZYVB1 clsp9+nhfAj/9OdgcGhYtIm/5IQaj3E8BgmKUJD5RfLJyC18QRBinGdY98q9kTTiZbqPiQR jHfmxBh3pMn8MxmVnNZcA== X-UI-Out-Filterresults: notjunk:1;V01:K0:ecbhy4sRPdE=:1lmwXTiCFxqE9j/SUKuaBg B9h7fZVecVxJmmtERzA3VKU5wpxNeH0ZuA/GW8bHBsP6AbKD5ke2kM/U1B0nke6xCeCs0P4bs nS12FsEdWhWCVNltX366aza9sJwdoNui9xcQr8qELGFf55dOAlgDyGlcqMfWYcnjI9DqwEbTH Ajs98tLi37PIDnlQdlozG9Ldi2gF0dN9csQumM8oGvttrwI1163wpyjjYOjMAIWGsAuWNSscB axSVK/6NAFLB1uelB0j/L8tEf2MFGNawsWqb4oG+0qZa9ftcxjml1j0K7+R6hWXVe5R3k/no4 3V1Dz6pmVWs9hWSAp9claiFiK6uBRqrNmRU5kuES3QnU6sQUWhOEt/cLd3eUYh2fj1RA8zoEq 6iJMvq4zh89UKzOwOIr3xrpAwPLn6jpwNlk9BBwVCyZ6RcaGt8xF2/XN1M0Cq/Vdayktkizty RR0MNK9BnUigWJbI0r+MeexGcea841jLoLTmvrA6c0fHYmi35acB3GYUbN10iZI9JJXYyBMtt QVjlWbYex5Hprxp9jOrxG1DL83YOP9KgtlGPEzh3T0D9EpGSW0QOSRC/zuQ15H/9DsLOLxeuI iSZfeU7xRHeF6SZ3z4NpJaaB5gm475/CbJdHw7dI+vHNKYxKRnxERuZ1N6Sue+cXz2Mz/8itn 3i7zpV7C5W6oJ4FGJa1HqH8ncbRwPDSDolojYkxbwg3tP3G5GcnyWmxVz/kYZSqmv01tOVil7 9GMKNcnCrExUKXFOk7+HTq37eNleQh9WXJwnAg== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: After the move of videobuf2 into the common directory, selecting the au0828 driver with CONFIG_V4L2 disabled started causing a link failure, as we now attempt to build videobuf2 but it still requires v4l2: ERROR: "v4l2_event_pending" [drivers/media/common/videobuf/videobuf2-v4l2.ko] undefined! ERROR: "v4l2_fh_release" [drivers/media/common/videobuf/videobuf2-v4l2.ko] undefined! ERROR: "video_devdata" [drivers/media/common/videobuf/videobuf2-v4l2.ko] undefined! ERROR: "__tracepoint_vb2_buf_done" [drivers/media/common/videobuf/videobuf2-core.ko] undefined! ERROR: "__tracepoint_vb2_dqbuf" [drivers/media/common/videobuf/videobuf2-core.ko] undefined! ERROR: "v4l_vb2q_enable_media_source" [drivers/media/common/videobuf/videobuf2-core.ko] undefined! We want to be able to build the core au0828 support without V4L2, so this makes the 'select' conditional on V4L2, and refines the dependencies in VIDEO_AU0828_V4L2 so it can only be enabled in the exact conditions that have VIDEOBUF2_VMALLOC reachable. Fixes: 03fbdb2fc2b8 ("media: move videobuf2 to drivers/media/common") Fixes: 05439b1a3693 ("[media] media: au0828 - convert to use videobuf2") Signed-off-by: Arnd Bergmann --- drivers/media/usb/au0828/Kconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/au0828/Kconfig b/drivers/media/usb/au0828/Kconfig index 70521e0b4c53..18630b033d5b 100644 --- a/drivers/media/usb/au0828/Kconfig +++ b/drivers/media/usb/au0828/Kconfig @@ -4,7 +4,7 @@ config VIDEO_AU0828 depends on I2C && INPUT && DVB_CORE && USB select I2C_ALGOBIT select VIDEO_TVEEPROM - select VIDEOBUF2_VMALLOC + select VIDEOBUF2_VMALLOC if VIDEO_V4L2 select DVB_AU8522_DTV if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_XC5000 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_MXL5007T if MEDIA_SUBDRV_AUTOSELECT @@ -18,7 +18,8 @@ config VIDEO_AU0828 config VIDEO_AU0828_V4L2 bool "Auvitek AU0828 v4l2 analog video support" - depends on VIDEO_AU0828 && VIDEO_V4L2 + depends on VIDEO_AU0828 + depends on VIDEO_V4L2=y || VIDEO_V4L2=VIDEO_AU0828 select DVB_AU8522_V4L if MEDIA_SUBDRV_AUTOSELECT select VIDEO_TUNER default y -- 2.9.0