From patchwork Fri Oct 2 22:07:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 7319241 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 7BE2E9F32B for ; Fri, 2 Oct 2015 22:08:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9FA87208AC for ; Fri, 2 Oct 2015 22:08:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B43CF208AA for ; Fri, 2 Oct 2015 22:08:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752063AbbJBWIE (ORCPT ); Fri, 2 Oct 2015 18:08:04 -0400 Received: from resqmta-po-03v.sys.comcast.net ([96.114.154.162]:51542 "EHLO resqmta-po-03v.sys.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751581AbbJBWHm (ORCPT ); Fri, 2 Oct 2015 18:07:42 -0400 Received: from resomta-po-01v.sys.comcast.net ([96.114.154.225]) by resqmta-po-03v.sys.comcast.net with comcast id QN7P1r0044s37d401N7h3M; Fri, 02 Oct 2015 22:07:41 +0000 Received: from mail.gonehiking.org ([73.181.52.62]) by resomta-po-01v.sys.comcast.net with comcast id QN7f1r0021LXgTt01N7hjt; Fri, 02 Oct 2015 22:07:41 +0000 Received: from lorien.internal (lorien-wl.internal [192.168.1.40]) by mail.gonehiking.org (Postfix) with ESMTP id BF172A151E; Fri, 2 Oct 2015 16:07:40 -0600 (MDT) From: Shuah Khan To: mchehab@osg.samsung.com, hans.verkuil@cisco.com, laurent.pinchart@ideasonboard.com, sakari.ailus@linux.intel.com, tiwai@suse.de, pawel@osciak.com, m.szyprowski@samsung.com, kyungmin.park@samsung.com, perex@perex.cz, dan.carpenter@oracle.com, tskd08@gmail.com, arnd@arndb.de, ruchandani.tina@gmail.com, corbet@lwn.net, k.kozlowski@samsung.com, chehabrafael@gmail.com, prabhakar.csengg@gmail.com, elfring@users.sourceforge.net, Julia.Lawall@lip6.fr, p.zabel@pengutronix.de, ricardo.ribalda@gmail.com, labbott@fedoraproject.org, chris.j.arges@canonical.com, pierre-louis.bossart@linux.intel.com, johan@oljud.se, wsa@the-dreams.de, jcragg@gmail.com, clemens@ladisch.de, daniel@zonque.org, gtmkramer@xs4all.nl, misterpib@gmail.com, takamichiho@gmail.com, pmatilai@laiskiainen.org, vladcatoi@gmail.com, damien@zamaudio.com, normalperson@yhbt.net, joe@oampo.co.uk, jussi@sonarnerd.net, calcprogrammer1@gmail.com Cc: Shuah Khan , linux-media@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH MC Next Gen 11/20] media: au0828 fix au0828_create_media_graph() entity checks Date: Fri, 2 Oct 2015 16:07:23 -0600 Message-Id: <243a0fc15048a2d81c5b893a788ec11801b58f98.1443822799.git.shuahkh@osg.samsung.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20140121; t=1443823661; bh=IPQGNpt1ZZI6hBZxstroLKIqblLXKkmfQmqKeKk+Wd0=; h=Received:Received:Received:From:To:Subject:Date:Message-Id; b=uvsclTDf1Esi1G+8hJmGdVWQuxeTcirvZwI5YVboeEB7IO2daaO6fenCfJZg7Rg5O /4IgrWo5lgPDDBjHbdKFar8uNX8gJNmCyj5YKCvHSXH2mJqyeNqvRa7B1m+e1UIKZr PPNtpxMvijfNGuK0Kuvh/uLyo/7tdCjuunEYWcPkMZW7Z2T3Pd+nnSqyeww3Xx/voe 0jGeCQUq205xqszht1SeIJo1kvdVVf7qwEW2HF7znWezYOiJHsfQPEfCWManq8DTBs cB8hvuMESwFYLOq4RwJ2Nv25dFbHzyMjYDkfC8sdTbi6AwgDx++EDESTpjivXe0bWj L88vyXrEq1fyg== 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_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,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 au0828_create_media_graph() doesn't do any checks to determine, if vbi_dev, vdev, and input entities have been registered prior to creating pad links. Checking graph_obj.mdev field works as the graph_obj.mdev field gets initialized in the entity register interface. Fix it to check graph_obj.mdev field before creating pad links. Signed-off-by: Shuah Khan --- drivers/media/usb/au0828/au0828-core.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c index b04c2a5..4fd7db8 100644 --- a/drivers/media/usb/au0828/au0828-core.c +++ b/drivers/media/usb/au0828/au0828-core.c @@ -287,20 +287,28 @@ static int au0828_create_media_graph(struct au0828_dev *dev) if (ret) return ret; } - ret = media_create_pad_link(decoder, AU8522_PAD_VID_OUT, - &dev->vdev.entity, 0, - MEDIA_LNK_FL_ENABLED); - if (ret) - return ret; - ret = media_create_pad_link(decoder, AU8522_PAD_VBI_OUT, - &dev->vbi_dev.entity, 0, - MEDIA_LNK_FL_ENABLED); - if (ret) - return ret; + + if (dev->vdev.entity.graph_obj.mdev) { + ret = media_create_pad_link(decoder, AU8522_PAD_VID_OUT, + &dev->vdev.entity, 0, + MEDIA_LNK_FL_ENABLED); + if (ret) + return ret; + } + if (dev->vbi_dev.entity.graph_obj.mdev) { + ret = media_create_pad_link(decoder, AU8522_PAD_VBI_OUT, + &dev->vbi_dev.entity, 0, + MEDIA_LNK_FL_ENABLED); + if (ret) + return ret; + } for (i = 0; i < AU0828_MAX_INPUT; i++) { struct media_entity *ent = &dev->input_ent[i]; + if (!ent->graph_obj.mdev) + continue; + if (AUVI_INPUT(i).type == AU0828_VMUX_UNDEFINED) break;