From patchwork Mon Jun 24 16:43:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Carrasco X-Patchwork-Id: 13709897 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C446BC2D0D1 for ; Mon, 24 Jun 2024 16:44:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 31D7E10E27D; Mon, 24 Jun 2024 16:44:12 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WwWhdeMT"; dkim-atps=neutral Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8214510E27D for ; Mon, 24 Jun 2024 16:44:06 +0000 (UTC) Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-42138eadf64so38710945e9.3 for ; Mon, 24 Jun 2024 09:44:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719247445; x=1719852245; darn=lists.freedesktop.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=8kHPT/Sbn+YowQq/I8VGD+WkhOqD5j84bm9SVl0pb1A=; b=WwWhdeMTg0tAnhAvi1G8cKgkNV59KYQOe6GIiUB5dljRe+ExaOXkp0738JN03uA48F QB0iwx902z3Fir/k8TT4GCAyTmP5mQh+c+VftBQzrpDHrWKcBpkeMlK6lxrrMCVp6TqE 4lbG9ipQBNhjDH4mMdnjZ0+QWj5wxJqYjFoZDd8jakWywCSKL6k0OxQcynP1rI2ZsYmV lKBU10Sa0DtVuJr9asm0fMqVfQVJ/Sg4/gUW2IqN2XQb1sAK71TJlR15OxqTtT/M0XvU HvDpCwbf1oB7w/eY/qhpLSgPGZeKVQTcXmi/48a+vU7MoHGsnkTrc6S8UdV/VQXsA43P FkCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719247445; x=1719852245; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8kHPT/Sbn+YowQq/I8VGD+WkhOqD5j84bm9SVl0pb1A=; b=upELFrBKVgopcCVTUSckMo3XvhG6CTcqERhN2W3YrJjtdtxvueHvt60nvr9ZO1fYen dIu/vg5JFeD1zoN6/1mw/oFitUDd1AMEHA5g+VPVBOWGQsDmpPAcy3N/dYMaE3HF+eOc KpzZ68UNfY9zuII1HLWJ7GFbp7lPbRsLYAgT+cjU4bDOD8LsMH6l7vLFjqY10tUokjpn NkMr34em9cNOhII0nm4IfUgKtmrua2vRi7FHHmQq00WGR0wkDF5JkXKhbTbBqz1qG0TU BfULsiejUEbX2X5w5Z4/WEzGjYgGbQDLl7ATa5obbPodrznx5qUr9QFiktK8kK12XOgp B4EQ== X-Gm-Message-State: AOJu0YxxuYo3rGou9ynpKfg8qwzV8XDGau/34//DczqkgL507r1c99Y1 kHuV7FvZI/MXdHBZbYhCtn8f9CSU1J6rp8yhFgYrOKj4legDaC/T X-Google-Smtp-Source: AGHT+IH+MF/1j+d+mvD3UvJmt7w30GJxIqwd74Gd3nbm7skLi+nadm6az73r+6Ot9QMhLZdiwI26aQ== X-Received: by 2002:a05:600c:450d:b0:421:7198:3d76 with SMTP id 5b1f17b1804b1-4248cc58b99mr34106605e9.28.1719247444697; Mon, 24 Jun 2024 09:44:04 -0700 (PDT) Received: from [127.0.1.1] (84-115-213-103.cable.dynamic.surfer.at. [84.115.213.103]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42484fc0aecsm126090365e9.12.2024.06.24.09.44.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 09:44:04 -0700 (PDT) From: Javier Carrasco Date: Mon, 24 Jun 2024 18:43:46 +0200 Subject: [PATCH 1/3] drm/mediatek: ovl_adaptor: drop unused mtk_crtc.h header MIME-Version: 1.0 Message-Id: <20240624-mtk_disp_ovl_adaptor_scoped-v1-1-9fa1e074d881@gmail.com> References: <20240624-mtk_disp_ovl_adaptor_scoped-v1-0-9fa1e074d881@gmail.com> In-Reply-To: <20240624-mtk_disp_ovl_adaptor_scoped-v1-0-9fa1e074d881@gmail.com> To: Chun-Kuang Hu , Philipp Zabel , David Airlie , Daniel Vetter , Matthias Brugger , AngeloGioacchino Del Regno , "Nancy.Lin" Cc: dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Javier Carrasco X-Mailer: b4 0.14-dev X-Developer-Signature: v=1; a=ed25519-sha256; t=1719247441; l=718; i=javier.carrasco.cruz@gmail.com; s=20240312; h=from:subject:message-id; bh=j/Zhl07/mGungCEQOMBPhb09WEiiiTeekEFTk2ivabw=; b=nsHPwkldRVFX0qaLEQCcbPwptfpdpZshqISZVJXbL07KghajM9UUXAa/ztlPZoq/H7lrAeLum wFs+M1/owgeDqHH9yoZFm/ngRVpRlYSYb9NOtW91UJ8iIKqf8x5MLG9 X-Developer-Key: i=javier.carrasco.cruz@gmail.com; a=ed25519; pk=lzSIvIzMz0JhJrzLXI0HAdPwsNPSSmEn6RbS+PTS9aQ= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" None of the elements from that header is used in this file. Signed-off-by: Javier Carrasco --- drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c index 02dd7dcdfedb..1418992311c4 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c @@ -17,7 +17,6 @@ #include #include -#include "mtk_crtc.h" #include "mtk_ddp_comp.h" #include "mtk_disp_drv.h" #include "mtk_drm_drv.h" From patchwork Mon Jun 24 16:43:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Carrasco X-Patchwork-Id: 13709898 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BD26EC2BD09 for ; Mon, 24 Jun 2024 16:44:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C697E10E4D5; Mon, 24 Jun 2024 16:44:12 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hrQJVeEI"; dkim-atps=neutral Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0529210E27D for ; Mon, 24 Jun 2024 16:44:08 +0000 (UTC) Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-4248ea53493so11085785e9.3 for ; Mon, 24 Jun 2024 09:44:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719247446; x=1719852246; darn=lists.freedesktop.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=uw74zf66DQORFJn85kqFB7s36On7KUi5ywYxV+PBn+Q=; b=hrQJVeEI0hIKgBitEgqsodnA1G+RnR0rnpg6svYpMSDzs2+/jZ0c1ejumpsjl/b48j llLfJdzxHgQykDZYFob7lm87WuhLfpp+ql7vhZWYjkvG6+KMLibw8uD7GfZHouGJIilX 2VnMBtjz+Afp1mHB2w1Fc3KY2McKGk/Rd4guKCBDjuQUW+5n8QPmDXx42iaTGKD+MENB csyO9uXdfLscNT5+Rh/XCOQHwm1we1s+K211zjmE0KQfLqKNDAMPD6RXIoc6igqr46Ho eWGTmyJbvm5m+PKbdawcAoPjVKx54UNvOB2Oz2TmJXfjUCL0M3nyI3utFsvK2bOuBfO3 6wAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719247446; x=1719852246; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uw74zf66DQORFJn85kqFB7s36On7KUi5ywYxV+PBn+Q=; b=oRUiLuZGVYx1TnGSdjX5fdBVVkpYh8ElAq1V02EKJGYZU+BX/OKRqkXH8wl2JK4YdS Gp/1z0L5u1byGvsqzv0f8o9b/K3ztHqbZm3tB8+ODamiABAKUuVVCCzgmymAobPwgCYu vhTKYt48mR48D4m9PjOz0X5YYRlOYFmi8jRO6HtxrjIhp7sl554CDbFqZUb3/lm0QFiU 9edC5V9aUb6YoJhL8A7hbeTXfrd4aUYjNXQRFaxaWGjxIK3vKy08gMX8LTQmbORGmAms zRbPdEW1e+fqpurJtamUMPeLVedALWBhcVijecvKsRO7fzQu0i95UMj1CwbBkr3bDLgz CSrQ== X-Gm-Message-State: AOJu0Yws0U5fbrVN85MvG+krs4/c1/dNnJmvxSwFSZl/Z/8J8qYj7NWZ 6+u31X2q4+Hxq6Eej7HlxgC5DEA1+to+tsglKCMHE5lD5SWSb1SI X-Google-Smtp-Source: AGHT+IFJgazm2qcBXOO1WWxGq23AutwedIYScGjsNMAPrLSl9grCFKoRB3d22V6hGWsVj6fq6F18nQ== X-Received: by 2002:a05:600c:6ca:b0:424:8dc4:ee43 with SMTP id 5b1f17b1804b1-4248dc4ef8cmr40224005e9.6.1719247446267; Mon, 24 Jun 2024 09:44:06 -0700 (PDT) Received: from [127.0.1.1] (84-115-213-103.cable.dynamic.surfer.at. [84.115.213.103]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42484fc0aecsm126090365e9.12.2024.06.24.09.44.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 09:44:05 -0700 (PDT) From: Javier Carrasco Date: Mon, 24 Jun 2024 18:43:47 +0200 Subject: [PATCH 2/3] drm/mediatek: ovl_adaptor: add missing of_node_put() MIME-Version: 1.0 Message-Id: <20240624-mtk_disp_ovl_adaptor_scoped-v1-2-9fa1e074d881@gmail.com> References: <20240624-mtk_disp_ovl_adaptor_scoped-v1-0-9fa1e074d881@gmail.com> In-Reply-To: <20240624-mtk_disp_ovl_adaptor_scoped-v1-0-9fa1e074d881@gmail.com> To: Chun-Kuang Hu , Philipp Zabel , David Airlie , Daniel Vetter , Matthias Brugger , AngeloGioacchino Del Regno , "Nancy.Lin" Cc: dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Javier Carrasco , stable@vger.kernel.org X-Mailer: b4 0.14-dev X-Developer-Signature: v=1; a=ed25519-sha256; t=1719247441; l=1042; i=javier.carrasco.cruz@gmail.com; s=20240312; h=from:subject:message-id; bh=Y2BB2weXpa+LoCNHgaMdua1IE8aKDXJvx8s/YfYa6MI=; b=RAqXlU9Qx0xyXFz5ElRIdZf5wbyhqD1m5J/GrWFrXfBbUzgeeyRE+ciEsRkz6rmFpz1gue41A vrubTA59EmVC63CZJ8zl+7GhwXzFo2s4l6d2Ty9wnfS3yvCWNVBinoH X-Developer-Key: i=javier.carrasco.cruz@gmail.com; a=ed25519; pk=lzSIvIzMz0JhJrzLXI0HAdPwsNPSSmEn6RbS+PTS9aQ= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Error paths that exit for_each_child_of_node() need to call of_node_put() to decerement the child refcount and avoid memory leaks. Add the missing of_node_put(). Cc: stable@vger.kernel.org Fixes: 453c3364632a ("drm/mediatek: Add ovl_adaptor support for MT8195") Signed-off-by: Javier Carrasco --- drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c index 1418992311c4..3faf26a55e77 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c @@ -522,8 +522,10 @@ static int ovl_adaptor_comp_init(struct device *dev, struct component_match **ma } comp_pdev = of_find_device_by_node(node); - if (!comp_pdev) + if (!comp_pdev) { + of_node_put(node); return -EPROBE_DEFER; + } priv->ovl_adaptor_comp[id] = &comp_pdev->dev; From patchwork Mon Jun 24 16:43:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Carrasco X-Patchwork-Id: 13709896 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 133DCC2BD09 for ; Mon, 24 Jun 2024 16:44:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 18A0D10E244; Mon, 24 Jun 2024 16:44:12 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WiXjVg64"; dkim-atps=neutral Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by gabe.freedesktop.org (Postfix) with ESMTPS id 802C610E27D for ; Mon, 24 Jun 2024 16:44:09 +0000 (UTC) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-42172ed3597so27116405e9.0 for ; Mon, 24 Jun 2024 09:44:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719247448; x=1719852248; darn=lists.freedesktop.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Ved9pZHSLvDLUPYxuu5ADz4/DRMPqTel82rQmFgJsv8=; b=WiXjVg64pJZQhl4M0h6g0juYG72H/GLB4Ag3vHAqVHZykQgXOqFELTYoZxRaJvvkLj o5vuN6RGZtSib6aV3UsCvZ5QEMMIksxXKXaqnKzGtP240w95HC1qWQpFpjIkrGf25Xvg 8zr4aAZeOQMkowd7/6p/2+hSyZjTdwSTpSjjVb4K8ksRyYU2YSsh0bw8aqbFFuVC+2QJ sXLOV8/efSKeAfeE+hjBVrjaLojG6H4tw6RT4aNQIbDFgMOauadGX464u2tU26uOkqjJ fyULM7Fa89qk+fQLoeR5gOHpGranwCtYarp3IFlDnLydyCLXSLrN454h3ANSqht3JUIT 0AIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719247448; x=1719852248; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ved9pZHSLvDLUPYxuu5ADz4/DRMPqTel82rQmFgJsv8=; b=O1939V/chAjNBCePCbDWowjo1c1uhxnTAQy7qVY406k4CPK3bVkBMcuagsZmQhUj0W Bjr7QalUBYV7BpfHXLhCSDwz0oraxX91E0n7AGJiwOXAaZoiDgkLkYBHbIEAO1qB2ITn XCfi2oxiP6wLVAQUIBHPo/H3AyqnwW5T48ZlPWUiu00+XK7NFp2FiYIS3kn+ZyvY2d4j YIekLgjucfOJmIzivuvrYqEjSGhf+pJSWpomBiuph070/ESGyHYp43Xl6EFPPsObYDi1 fIrzjWmfcc37V0yoRbxQBAEGHVJpr21+xKgLV0J2MbNy4Y3DMBMXMbxp6hgPsP0Y9I15 no2w== X-Gm-Message-State: AOJu0YzBVrl2MlsMnsr/60zeHWKtQjjJYgPjLW7iPg3J9Be8Rp9gZICi gJX357+ohS2zHXNexZe2lUbYk2paRN8wGTEIyq31fZsjd4pzN0HD X-Google-Smtp-Source: AGHT+IFxufk+8bZWSFo5H95XETmbIR8xWYc74lh7Lzz8/zakL9+PW+wJ3qLYXaIxadr7Xc+Z3bl8Bg== X-Received: by 2002:a05:600c:138e:b0:421:805f:ab3c with SMTP id 5b1f17b1804b1-42489533effmr61514635e9.14.1719247447674; Mon, 24 Jun 2024 09:44:07 -0700 (PDT) Received: from [127.0.1.1] (84-115-213-103.cable.dynamic.surfer.at. [84.115.213.103]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42484fc0aecsm126090365e9.12.2024.06.24.09.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 09:44:07 -0700 (PDT) From: Javier Carrasco Date: Mon, 24 Jun 2024 18:43:48 +0200 Subject: [PATCH 3/3] drm/mediatek: ovl_adaptor: use scoped variant of for_each_child_of_node() MIME-Version: 1.0 Message-Id: <20240624-mtk_disp_ovl_adaptor_scoped-v1-3-9fa1e074d881@gmail.com> References: <20240624-mtk_disp_ovl_adaptor_scoped-v1-0-9fa1e074d881@gmail.com> In-Reply-To: <20240624-mtk_disp_ovl_adaptor_scoped-v1-0-9fa1e074d881@gmail.com> To: Chun-Kuang Hu , Philipp Zabel , David Airlie , Daniel Vetter , Matthias Brugger , AngeloGioacchino Del Regno , "Nancy.Lin" Cc: dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Javier Carrasco X-Mailer: b4 0.14-dev X-Developer-Signature: v=1; a=ed25519-sha256; t=1719247441; l=1676; i=javier.carrasco.cruz@gmail.com; s=20240312; h=from:subject:message-id; bh=wa0T80IF/y+nnAamP5x5ocsqIEtI9E9JOf3ilDfD1yo=; b=M9kK0ImZkRyD1NOWZet5N+FhNkzhbstvrwy7I96XW9Qwjr5TGDy8zsCLgzUzrxPsLZTtpED/X cFIZmEu7appC+67/uzXN9oG5FM74e5jHbRgj7YIRdMdBI8ar0b/8ytM X-Developer-Key: i=javier.carrasco.cruz@gmail.com; a=ed25519; pk=lzSIvIzMz0JhJrzLXI0HAdPwsNPSSmEn6RbS+PTS9aQ= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" In order to avoid potential memory leaks if new error paths are added without a call to of_node_put(), use for_each_child_of_node_scoped() instead of for_each_child_of_node(). The former automatically decrements the refcount when the child goes out of scope, which removes the need for explicit calls to of_node_put(). Signed-off-by: Javier Carrasco --- drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c index 3faf26a55e77..aec927cce468 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c @@ -493,12 +493,12 @@ static int compare_of(struct device *dev, void *data) static int ovl_adaptor_comp_init(struct device *dev, struct component_match **match) { struct mtk_disp_ovl_adaptor *priv = dev_get_drvdata(dev); - struct device_node *node, *parent; + struct device_node *parent; struct platform_device *comp_pdev; parent = dev->parent->parent->of_node->parent; - for_each_child_of_node(parent, node) { + for_each_child_of_node_scoped(parent, node) { const struct of_device_id *of_id; enum mtk_ovl_adaptor_comp_type type; int id; @@ -522,10 +522,8 @@ static int ovl_adaptor_comp_init(struct device *dev, struct component_match **ma } comp_pdev = of_find_device_by_node(node); - if (!comp_pdev) { - of_node_put(node); + if (!comp_pdev) return -EPROBE_DEFER; - } priv->ovl_adaptor_comp[id] = &comp_pdev->dev;