From patchwork Tue Aug 7 15:40:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 10558835 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4D6E014E5 for ; Tue, 7 Aug 2018 15:40:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D21C2A500 for ; Tue, 7 Aug 2018 15:40:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 38EF22A549; Tue, 7 Aug 2018 15:40:15 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 AD20E2A4EF for ; Tue, 7 Aug 2018 15:40:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389181AbeHGRzH (ORCPT ); Tue, 7 Aug 2018 13:55:07 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:58342 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387578AbeHGRzG (ORCPT ); Tue, 7 Aug 2018 13:55:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Sender:Message-Id:Date:Subject:Cc:To: From:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=kjbDyboCT7HN7oaxl5PUxhZX/c6Mxd4u9zO1Y8Mihpw=; b=TRUYBIAAkes5lTMxdNs42bbcV5 MbJD0X0a+2PCBCrgXgBmLYTibF453uI8ySjc0UWO88SB90behS/7DqS6Y5KU9fCSbUGbS0Tuks28d /F65EdvFjDhoW5LwDVjkC81LPUb6gcipMnvfkZ3rVUwWDPGLehb13xOW3pPOveunmbkVh+QZBwkY8 RJIwpx89z9bzh9t9cQLmfm3u4vO4S3db3WNEYUlVQJ77hRpc4xt+Y1slgLOb//zqcLcBhPjaC5gQ7 t+BBoxLg80t5hZtxYjeLtqoqrlW0CnX+kC/4ZzqmnYacoPXX83GQk7WC+oEKJwQtbRkLaqF223rm2 +u02QcFA==; Received: from [179.177.31.111] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fn45k-0006nW-Ip; Tue, 07 Aug 2018 15:40:12 +0000 Received: from mchehab by bombadil.infradead.org with local (Exim 4.91) (envelope-from ) id 1fn45i-000A6J-Aq; Tue, 07 Aug 2018 11:40:10 -0400 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Linux Media Mailing List , Mauro Carvalho Chehab , Jacopo Mondi Subject: [PATCH] media: mt9v111: fix random build errors Date: Tue, 7 Aug 2018 11:40:09 -0400 Message-Id: X-Mailer: git-send-email 2.17.1 To: unlisted-recipients:; (no To-header on input) 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 Fix the internal check for it to do the right thing if the subdev API is not built. Reported-by: Randy Dunlap Reported-by: kbuild test robot Suggested-by: Jacopo Mondi Signed-off-by: Mauro Carvalho Chehab Reported-by: Randy Dunlap Reported-by: kbuild test robot Signed-off-by: Jacopo Mondi Signed-off-by: Mauro Carvalho Chehab --- drivers/media/i2c/mt9v111.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/mt9v111.c b/drivers/media/i2c/mt9v111.c index 70fad0940435..b5410aeb5fe2 100644 --- a/drivers/media/i2c/mt9v111.c +++ b/drivers/media/i2c/mt9v111.c @@ -797,7 +797,7 @@ static struct v4l2_mbus_framefmt *__mt9v111_get_pad_format( { switch (which) { case V4L2_SUBDEV_FORMAT_TRY: -#if IS_ENABLED(CONFIG_MEDIA_CONTROLLER) +#if IS_ENABLED(CONFIG_VIDEO_V4L2_SUBDEV_API) return v4l2_subdev_get_try_format(&mt9v111->sd, cfg, pad); #else return &cfg->try_fmt;