Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756429AbdLONkm (ORCPT ); Fri, 15 Dec 2017 08:40:42 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:43195 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756111AbdLONki (ORCPT ); Fri, 15 Dec 2017 08:40:38 -0500 X-Google-Smtp-Source: ACJfBot79VnvPL8MreqO5lwXjwBhZqikHDEJ+OfN80vtOrkKmzJ1dOMEmUrrUl+3XNUo5YSZ3SUG7A== From: Loys Ollivier To: Andy Gross , David Brown Cc: Loys Ollivier , linux-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, Jerome Brunet , Stephen Boyd Subject: [PATCH v3] firmware: qcom: scm: Fix incorrect of_node_put calls in scm_init Date: Fri, 15 Dec 2017 14:40:14 +0100 Message-Id: <1513345214-22835-1-git-send-email-lollivier@baylibre.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1190 Lines: 42 When using other platform architectures, in the init of the qcom_scm driver, of_node_put is called on /firmware if no qcom dt is found. This results in a kernel error: Bad of_node_put() on /firmware. These calls to of_node_put from the qcom_scm init are unnecessary as of_find_matching_node and of_platform_populate are calling it automatically. Remove the calls to of_node_put() on fw_np. Fixes: d0f6fa7ba2d6 ("firmware: qcom: scm: Convert SCM to platform driver") Suggested-by: Stephen Boyd Signed-off-by: Loys Ollivier --- drivers/firmware/qcom_scm.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c index af4c75217ea6..f6d7b7cffe0c 100644 --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c @@ -632,17 +632,13 @@ static int __init qcom_scm_init(void) np = of_find_matching_node(fw_np, qcom_scm_dt_match); - if (!np) { - of_node_put(fw_np); + if (!np) return -ENODEV; - } of_node_put(np); ret = of_platform_populate(fw_np, qcom_scm_dt_match, NULL, NULL); - of_node_put(fw_np); - if (ret) return ret; -- 2.7.4