From patchwork Wed May 4 19:28:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Lippers-Hollmann X-Patchwork-Id: 9017981 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2071F9F30C for ; Wed, 4 May 2016 19:29:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 85A0C201C7 for ; Wed, 4 May 2016 19:29:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D8345201F2 for ; Wed, 4 May 2016 19:29:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752831AbcEDT3F (ORCPT ); Wed, 4 May 2016 15:29:05 -0400 Received: from mout.gmx.net ([212.227.17.20]:62249 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752610AbcEDT3D (ORCPT ); Wed, 4 May 2016 15:29:03 -0400 Received: from mir ([79.203.23.34]) by mail.gmx.com (mrgmx101) with ESMTPSA (Nemesis) id 0MS1g6-1b43000LwA-00THKs; Wed, 04 May 2016 21:28:54 +0200 Date: Wed, 4 May 2016 21:28:45 +0200 From: Stefan Lippers-Hollmann To: Linus Torvalds Cc: Mauro Carvalho Chehab , Linux Media Mailing List , Linux Kernel Mailing List Subject: Re: [GIT PULL for v4.6-rc1] media updates Message-ID: <20160504212845.21dab7c8@mir> In-Reply-To: References: <20160315080552.3cc5d146@recife.lan> <20160503233859.0f6506fa@mir> <20160504063902.0af2f4d7@mir> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Provags-ID: V03:K0:6NvBcoGemHRyfJSRdLl0nIOeN2I73EdUK+kJGbvqnl0NPM/Wn66 lPk4yGdWLqMKzK6juHjAtTeSjW61AG2BFwghJIdqkQCzsMvNMqlEzzHiySlqopePLrc4Bfm ykf7Ww9o16vgnTIYlxUOT+C71aWDnb8W0nhGB82c/sdBEsIFvKrAxvlYDkwN1wE3IVaLJPF Ei1OiYrBoLuaxAjNTn08g== X-UI-Out-Filterresults: notjunk:1; V01:K0:d7P1QpgmK6Y=:eHQGT8BCY9FldQ2wQvg0Z3 alCsEtuTbQT9V029ijoWAsSljoa5Fes3FhYBRrA6hYElFVg+K0z//A9lc94cvcjXT82FIfLP2 G3q+3UWj4+DHUHZsbvfMmjSa6LXecjVteh6aQgIm/krbANYlmLLtKWiIFT1BcZ8NFBNT+PoLM aXo9hD0ctxuJYgALpgKyiQFLbYWppHAZWJdgnq3ArLDTOPlC4WWmPFGi84iDtZSgcwbog6WbJ wp5mZbLjOxILjbbraWoafROwwNEDq02VIi4MNUdQwoy/YJL1i6QEUntQ+kdfAOQJrhM7LzuJP dVOrm0HOmyLs+SllkPdU1D+MzNCF5X9AYG1Trq3I9Txxkyp2YOE4IMlnp7yYKDTIk1o5c+qRo eeJe6vms5COccVAqxEH2DEZks4R1m6sT24I0YxULuP0WzRAVhIVzfZS7sBk5+YPBafdU2hsi3 ifid1DJDnFbZJ8VVcbUEKdPB8OcdoRoz93azMso3vQpBqsKPMfER04yePYf6CGRRe/54aDnYX DzZMVprlXwo8n3MGeYEf+mo6TmT7edC1Cfy5SsINMurU1h47SSafvFfhZH6FwJcJOURPpKIUb urvga9F7wIIOVOPDa1zPDniEFeKE3U/HU70Dt+k6yGJpFQbRfPl4yDFBi/8rpjMxL1688exci RhWKmpOS1Ud+Q1VrKsiM1flqK+XfX+U69iJRh3g/4gl+zRgJ8ueTFRmx6dsO2kg7kjvQxSKYj Pkm31vusbiPOHWIgZJmOZ4lRl3XI8EHEtaQp3JRxHEL19dcw1c4i8WjLRyg= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_TVD_MIME_EPI,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi On 2016-05-04, Linus Torvalds wrote: > On Tue, May 3, 2016 at 9:39 PM, Stefan Lippers-Hollmann wrote: > > > > Just as a cross-check, this (incomplete, but au0828, cx231xx and em28xx > > aren't needed/ loaded on my system) crude revert avoids the problem for > > me on v4.6-rc6-113-g83858a7. > > Hmm. > > That just open-codes __media_device_usb_init(). > > The main difference seems to be that __media_device_usb_init() ends up > having that > > #ifdef CONFIG_USB > #endif > > around it. > > I think that is bogus. > > What happens if you replace that #ifdef CONFIG_USB in > __media_device_usb_init() with > > #if CONFIG_USB || (MODULE && CONFIG_USB_MODULE) [...] that throws drivers/media/media-device.c: In function '__media_device_usb_init': drivers/media/media-device.c:878:5: warning: "CONFIG_USB" is not defined [-Wundef] #if CONFIG_USB || (MODULE && CONFIG_USB_MODULE) ^ however, taking arch/arm/mach-omap1/include/mach/usb.h as example, changing it to indeed fixes the problem for me Thanks a lot! Regards Stefan Lippers-Hollmann --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -875,7 +875,7 @@ void __media_device_usb_init(struct medi const char *board_name, const char *driver_name) { -#ifdef CONFIG_USB +#if defined(CONFIG_USB) || defined(CONFIG_USB_MODULE) mdev->dev = &udev->dev; if (driver_name)