From patchwork Tue Dec 22 10:27:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Okash Khawaja X-Patchwork-Id: 7903561 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 23932BEEE5 for ; Tue, 22 Dec 2015 10:27:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 66B0F2053C for ; Tue, 22 Dec 2015 10:27:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 982D8205B3 for ; Tue, 22 Dec 2015 10:27:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751833AbbLVK11 (ORCPT ); Tue, 22 Dec 2015 05:27:27 -0500 Received: from mail-wm0-f41.google.com ([74.125.82.41]:37088 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751370AbbLVK10 (ORCPT ); Tue, 22 Dec 2015 05:27:26 -0500 Received: by mail-wm0-f41.google.com with SMTP id p187so104385176wmp.0; Tue, 22 Dec 2015 02:27:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:content-transfer-encoding:user-agent; bh=HISLeuOWP7yW87M0uRd6nkC04UcSzx/e6jhX/8WvJuI=; b=PBV8vg02idl65ufBDUz4b5FAGdIALJRLXvDEzmGZZkD1fKGHh675rORqlUINtvLjIx 47+5T+6x/JirPZ9UmMOKgZvt3mfBwOJsHbAsDMH8yqFrTdGGoTGdT44OUGc6u07onW6C 6OWi/DiHM8oTIu0DTU7SdTdhNx2Y2cNhw+cJMyc+Kgmz1jfeCFO+gI1JXDJMJ9+T/5Mu KS1W0vfq0HW5rJ3H2QAQYVsWf0JloNO1wYyNuaC8PVPuBMf1ft2YzbRAg6Al+ofAkUFI iGswuFI4/MFwxgSeu6RjAPRHgaqKRfaCw/FSBrx0oLuJq4phNe1G72yCJTs/4BhCNGNG qggw== X-Received: by 10.194.206.41 with SMTP id ll9mr29213746wjc.10.1450780045330; Tue, 22 Dec 2015 02:27:25 -0800 (PST) Received: from bytefire-computer (cpc91352-watf11-2-0-cust637.15-2.cable.virginm.net. [86.2.150.126]) by smtp.gmail.com with ESMTPSA id y133sm19563552wmg.10.2015.12.22.02.27.24 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Dec 2015 02:27:24 -0800 (PST) Date: Tue, 22 Dec 2015 10:27:21 +0000 From: Okash Khawaja To: mchehab@osg.samsung.com, javier@osg.samsung.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] next: media: cx231xx: add #ifdef to fix compile error Message-ID: <20151222102721.GA1892@bytefire-computer> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Compiling linux-next gave this warning: drivers/media/usb/cx231xx/cx231xx-cards.c: In function ‘cx231xx_usb_probe’: drivers/media/usb/cx231xx/cx231xx-cards.c:1754:36: error: ‘struct cx231xx’ has no member named ‘media_dev’ retval = media_device_register(dev->media_dev); Looking at the refactoring in past two commits, following seems like a decent fix, i.e. to surround dev->media_dev by #ifdef CONFIG_MEDIA_CONTROLLER. Signed-off-by: Okash Khawaja --- drivers/media/usb/cx231xx/cx231xx-cards.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c index 35692d1..220a5db 100644 --- a/drivers/media/usb/cx231xx/cx231xx-cards.c +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c @@ -1751,7 +1751,9 @@ static int cx231xx_usb_probe(struct usb_interface *interface, if (retval < 0) goto done; +#ifdef CONFIG_MEDIA_CONTROLLER retval = media_device_register(dev->media_dev); +#endif done: if (retval < 0)