From patchwork Tue Jul 19 15:14:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9237699 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6AEC96075D for ; Tue, 19 Jul 2016 15:17:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5DC56277D9 for ; Tue, 19 Jul 2016 15:17:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5216A27813; Tue, 19 Jul 2016 15:17:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BFB712015F for ; Tue, 19 Jul 2016 15:17:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753528AbcGSPRX (ORCPT ); Tue, 19 Jul 2016 11:17:23 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:62477 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751972AbcGSPRW (ORCPT ); Tue, 19 Jul 2016 11:17:22 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0Le4z6-1b0QHH0wO4-00pszp; Tue, 19 Jul 2016 17:17:15 +0200 From: Arnd Bergmann To: Mauro Carvalho Chehab Cc: Arnd Bergmann , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] [media] dvb-usb: avoid link error with dib3000m{b,c| Date: Tue, 19 Jul 2016 17:14:35 +0200 Message-Id: <20160719151645.2610846-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160719151645.2610846-1-arnd@arndb.de> References: <20160719151645.2610846-1-arnd@arndb.de> X-Provags-ID: V03:K0:yFSjqY0LtytTGlzIrELFdN1/1/Dzi4XGL6arJOOviKFEZph26TJ iQAGSzAA6ZRL8137NQGC6/7scY+JBM/lLZWAqlPOkdNrPD8wZP2pJop7EUYFBOUw0epRIt6 zjJaB5hNwYaz/qt2Cdt2x2ApN2BoXmpcCA0z4RwAgzjwJya07zaMoZOPtww9/pskUcC8dcx RAZrvh7ycWoy7Cr2Aw19Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:q/7CY4TeqLg=:5oUZXOkjKiTGxCD/V8zWLS 6UrQpPqDHpjuBMLpH7Fp/epCOqJ0CS26NxJqZ7knZ6pYisLRQ8bZkfaY8iG7E4Kc1tpPfXvK4 l4rV393QHTzAC/oN+AcJGPntfHL0xCKZxHJeIanFQVRViMJljuGozyONy4EaqrmaayevO4FGG LsuljcCO1oJbXi3oz9dhalyqilnCXNrgxCkg+73myOuNB1eXbMkUP/jNIuJo1JDnDhSZNarCy w6q207wrs4ipy+u3wUWC98K92VuE8OxgPN1N86qhotyLZIPvKPeCn/ZAEwqy5K5q6TDAXnkQ8 +/CZISoNhQ9AfPf7/XEhwpv2UKIiLv3qi/X1OHWfyxovJMt3YSVO1D4eOYt3WiGLTryVtaKkr n58PzXiMhLERio77bxxM9Ud3DJelq84UqNe4vs5vyaBPA/bI0cszyxfKbzq9OJrMWbFeKh/b3 rwpEpYI7NCCzn2k9PmHsVODTp2cGwl8Y6rDH6de3h3gGXCI69q38mW/Ud87PuAC9DLgpfwDkY csIBgpVEN4sXK1CUAAwbX4VfCalEvyFcbZ1aE75yAHgcuGIfLvx10zG2F7H5aYvTbhkbWNqDu cutaVMV2AF1eRiKDSEYYnNcRv71DEeMMHp/JOn9AoeiDE3IUwe1Ktoro2kXiH3MeXns5S8qFV SSMK6Z5AuNZj/JUpXKyNXt1ec9Ky/FwhidfsvzYbu15ECoW+l1gze4DZazHs2Nx4pF98= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Tha ARM randconfig builds came up with another rare build failure for the dib3000mc driver, when dvb-usb-dibusb-mb is built-in and dib3000mc is a loadable module: ERROR: "dibusb_dib3000mc_frontend_attach" [drivers/media/usb/dvb-usb/dvb-usb-nova-t-usb2.ko] undefined! ERROR: "dibusb_dib3000mc_tuner_attach" [drivers/media/usb/dvb-usb/dvb-usb-nova-t-usb2.ko] undefined! Apparently this used to be a valid configuration (build-time, not run-time), but broke as part of a cleanup. I tried reverting the cleanup, but saw that the code was still wrong then. This version adds a dependency for dib3000mb, to ensure that dib3000mb does not force the dibusb_dib3000mc_frontend_attach function to be built-in when dib3000mc is a loadable module. I have also checked the two other files that were changed in the original cleanup, and found them to be correct in either version, so I do not touch that part. As this is a rather obscure bug, there is no need for backports. Signed-off-by: Arnd Bergmann Fixes: 028c70ff42783 ("[media] dvb-usb/dvb-usb-v2: use IS_ENABLED") --- This is one of two different ways to avoid the link error, please pick one of them. Adding a dependency is simpler but slighly more limiting. --- 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 8c911119faa6..959fa09dfd92 100644 --- a/drivers/media/usb/dvb-usb/Kconfig +++ b/drivers/media/usb/dvb-usb/Kconfig @@ -44,6 +44,7 @@ config DVB_USB_DIBUSB_MB depends on DVB_USB select DVB_PLL if MEDIA_SUBDRV_AUTOSELECT select DVB_DIB3000MB + depends on DVB_DIB3000MC || !DVB_DIB3000MC select MEDIA_TUNER_MT2060 if MEDIA_SUBDRV_AUTOSELECT help Support for USB 1.1 and 2.0 DVB-T receivers based on reference designs made by