Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp1176127ybn; Tue, 24 Sep 2019 16:10:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqx1wBxN/evzzGAd34qtYV1B62XtBAZC36FjfxgaojwKBux4tSvd6Dm5e6qI3BMOMQ2yNMb5 X-Received: by 2002:adf:f20e:: with SMTP id p14mr4991177wro.212.1569366622922; Tue, 24 Sep 2019 16:10:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569366622; cv=none; d=google.com; s=arc-20160816; b=Ite0XxKhgKUrY6asGOZb9ZbYl5IFdNAFXE9/2TO+YJa62hn1jjfSmAYTG+mbhiKot0 l9FpHyttVZyxt2dIMv33kk6dAzzQcMR3R8H1KKB5kTIeR0WR3lvaxDUKx1wMsvCklpcX dVKjqLZDTnAMPTnCI/I2Q4L+eby3H2ZcVSS/IhyX0BU15TVbYNjYuBzntAFyWQUsGC2x ES3jumb1joNlaK4J4WHrAlxhffE5It//WXHGyvUCLql8trcRUiMtciEvWAe1GwVowv5U 1FtEVFxohgTJez2PqG9/H0p5tjE15dZjzAxJGA1pyPYkCovLgkr92S8eV3+kWYCG/Bql D4SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=f139OOnXsskFQu9T8aucCbCIWT3c2khwWN3KmBNCOgk=; b=EMlUXioefY6GUJ/rPl6kk+ZbRt/B23YGW29crrBH+DBGLZL2FuXDjHTkA/vSWywiFh kSKhRCmqruL8apcrEpv/iguNIG0On13tommwJmXpg+29dHdLCV9MbzJYtSokMo0gqQBW 6ELy/k87V7SR9QU72kF1xVRdYtNl9Or/4BdwT+QMlpCRm0ntDa5JwGG8lz9DM0cCnSxi uSzOTN0QiPDKKcdPc7rUN/3yX29PcgpOHaguVOyr9pch/a8/I/wsMtyWZ31WI/KWcbYp RXi5ntWXTAfapHt1h08JFGM8sjhMUNk4HCbuAtFBU4/C0K4DsEK8w9QMBLepRqk68aLX Hx6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=CgGWxf6d; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a25si1711398eju.71.2019.09.24.16.09.31; Tue, 24 Sep 2019 16:10:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=CgGWxf6d; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406771AbfIVTgi (ORCPT + 99 others); Sun, 22 Sep 2019 15:36:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:42264 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729099AbfIVSqM (ORCPT ); Sun, 22 Sep 2019 14:46:12 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E2B2820665; Sun, 22 Sep 2019 18:46:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569177971; bh=LYIbF59LRkqGRsnLtIcvlgJlu1D6vqFSlyn1nFHtP2M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CgGWxf6d1ISBQCBA65RGYX0iWXBYU/nLS6W3gMY5hNZVZF7sDoZQJBOcH83CcqTcf 5n1eyUA+SlN7n8lOEPyeLYdh8qKxbUoFA3aALQIWOCZqoRe8e+PCFRNXGG0T5G553F AsE7n+rLmnoatLMCKZs577coM0uEJF6wjaskEoB0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Matthias Brugger , Houlong Wei , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 070/203] media: mtk-mdp: fix reference count on old device tree Date: Sun, 22 Sep 2019 14:41:36 -0400 Message-Id: <20190922184350.30563-70-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matthias Brugger [ Upstream commit 864919ea0380e62adb2503b89825fe358acb8216 ] of_get_next_child() increments the reference count of the returning device_node. Decrement it in the check if we are using the old or the new DTB. Fixes: ba1f1f70c2c0 ("[media] media: mtk-mdp: Fix mdp device tree") Signed-off-by: Matthias Brugger Acked-by: Houlong Wei [hverkuil-cisco@xs4all.nl: use node instead of parent as temp variable] Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c index fc9faec85edb6..5d44f2e92dd50 100644 --- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c @@ -110,7 +110,9 @@ static int mtk_mdp_probe(struct platform_device *pdev) mutex_init(&mdp->vpulock); /* Old dts had the components as child nodes */ - if (of_get_next_child(dev->of_node, NULL)) { + node = of_get_next_child(dev->of_node, NULL); + if (node) { + of_node_put(node); parent = dev->of_node; dev_warn(dev, "device tree is out of date\n"); } else { -- 2.20.1