From patchwork Mon Feb 24 14:10:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 230571 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65157C11D32 for ; Mon, 24 Feb 2020 14:38:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 36ECF20880 for ; Mon, 24 Feb 2020 14:38:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582555097; bh=9wzXgi/eRPGdw200if5VKnhThCFwGRINbttPGCL8vqc=; h=From:Date:Subject:To:Cc:Reply-to:List-ID:From; b=ek4pFQuIZvAggNDKBpmBagLOC6CDwf8rCAdKHv76vBTtRF6fr0Bk6/RfadxtWp2pA mf1Y7+Vd+zCele78/2ZEt9IxaXezyF3ujYyFnUbjXLmacBGvfb+xRudv13Q6pIxiJg RecFHiWOh9IdZZ8xQUoXDUpl05EQb2NNG7t0iJjc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727648AbgBXOiQ (ORCPT ); Mon, 24 Feb 2020 09:38:16 -0500 Received: from www.linuxtv.org ([130.149.80.248]:54418 "EHLO www.linuxtv.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727160AbgBXOiQ (ORCPT ); Mon, 24 Feb 2020 09:38:16 -0500 Received: from mchehab by www.linuxtv.org with local (Exim 4.92) (envelope-from ) id 1j6EqW-008us6-43; Mon, 24 Feb 2020 14:36:32 +0000 From: Mauro Carvalho Chehab Date: Mon, 24 Feb 2020 14:10:39 +0000 Subject: [git:media_tree/master] media: hantro: Fix broken media controller links To: linuxtv-commits@linuxtv.org Cc: Ezequiel Garcia , stable@vger.kernel.org, Hans Verkuil , Nicolas Dufresne Mail-followup-to: linux-media@vger.kernel.org Forward-to: linux-media@vger.kernel.org Reply-to: linux-media@vger.kernel.org Message-Id: Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This is an automatic generated email to let you know that the following patch were queued: Subject: media: hantro: Fix broken media controller links Author: Ezequiel Garcia Date: Tue Feb 4 20:38:37 2020 +0100 The driver currently creates a broken topology, with a source-to-source link and a sink-to-sink link instead of two source-to-sink links. Reported-by: Nicolas Dufresne Cc: # for v5.3 and up Signed-off-by: Ezequiel Garcia Tested-by: Nicolas Dufresne Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab drivers/staging/media/hantro/hantro_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c index 97c615a2f057..c98835326135 100644 --- a/drivers/staging/media/hantro/hantro_drv.c +++ b/drivers/staging/media/hantro/hantro_drv.c @@ -558,13 +558,13 @@ static int hantro_attach_func(struct hantro_dev *vpu, goto err_rel_entity1; /* Connect the three entities */ - ret = media_create_pad_link(&func->vdev.entity, 0, &func->proc, 1, + ret = media_create_pad_link(&func->vdev.entity, 0, &func->proc, 0, MEDIA_LNK_FL_IMMUTABLE | MEDIA_LNK_FL_ENABLED); if (ret) goto err_rel_entity2; - ret = media_create_pad_link(&func->proc, 0, &func->sink, 0, + ret = media_create_pad_link(&func->proc, 1, &func->sink, 0, MEDIA_LNK_FL_IMMUTABLE | MEDIA_LNK_FL_ENABLED); if (ret)