From mboxrd@z Thu Jan 1 00:00:00 1970 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=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 1AB5EC2D0A3 for ; Mon, 9 Nov 2020 13:25:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E433C2083B for ; Mon, 9 Nov 2020 13:25:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387965AbgKINZS (ORCPT ); Mon, 9 Nov 2020 08:25:18 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:7069 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387441AbgKINZQ (ORCPT ); Mon, 9 Nov 2020 08:25:16 -0500 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4CVBYq5x05zhjXm; Mon, 9 Nov 2020 21:25:03 +0800 (CST) Received: from huawei.com (10.175.127.227) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Mon, 9 Nov 2020 21:25:01 +0800 From: Yu Kuai To: , , , , , , , CC: , , , , Subject: [PATCH V2] memory: tegra: add missing put_devcie() call in error path of tegra_emc_probe() Date: Mon, 9 Nov 2020 21:28:47 +0800 Message-ID: <20201109132847.1738010-1-yukuai3@huawei.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20201102185216.GB13405@kozik-lap> References: <20201102185216.GB13405@kozik-lap> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.127.227] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org The reference to device obtained with of_find_device_by_node() should be dropped. Thus add jump target to fix the exception handling for this function implementation. Fixes: 73a7f0a90641("memory: tegra: Add EMC (external memory controller) driver") Signed-off-by: Yu Kuai --- drivers/memory/tegra/tegra124-emc.c | 21 +++++++++++++------ .../net/ethernet/freescale/fman/fman_port.c | 3 +-- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/memory/tegra/tegra124-emc.c b/drivers/memory/tegra/tegra124-emc.c index 76ace42a688a..7d58a0e0a177 100644 --- a/drivers/memory/tegra/tegra124-emc.c +++ b/drivers/memory/tegra/tegra124-emc.c @@ -1207,8 +1207,10 @@ static int tegra_emc_probe(struct platform_device *pdev) return -ENOENT; emc->mc = platform_get_drvdata(mc); - if (!emc->mc) - return -EPROBE_DEFER; + if (!emc->mc) { + err = -EPROBE_DEFER; + goto put_device; + } ram_code = tegra_read_ram_code(); @@ -1217,25 +1219,27 @@ static int tegra_emc_probe(struct platform_device *pdev) dev_err(&pdev->dev, "no memory timings for RAM code %u found in DT\n", ram_code); - return -ENOENT; + err = -ENOENT; + goto put_device; } err = tegra_emc_load_timings_from_dt(emc, np); of_node_put(np); if (err) - return err; + goto put_device; if (emc->num_timings == 0) { dev_err(&pdev->dev, "no memory timings for RAM code %u registered\n", ram_code); - return -ENOENT; + err = -ENOENT; + goto put_device; } err = emc_init(emc); if (err) { dev_err(&pdev->dev, "EMC initialization failed: %d\n", err); - return err; + goto put_device; } platform_set_drvdata(pdev, emc); @@ -1244,6 +1248,11 @@ static int tegra_emc_probe(struct platform_device *pdev) emc_debugfs_init(&pdev->dev, emc); return 0; + +put_device: + put_device(&mc->dev); + + return err; }; static struct platform_driver tegra_emc_driver = { diff --git a/drivers/net/ethernet/freescale/fman/fman_port.c b/drivers/net/ethernet/freescale/fman/fman_port.c index 9790e483241b..fcc59444df17 100644 --- a/drivers/net/ethernet/freescale/fman/fman_port.c +++ b/drivers/net/ethernet/freescale/fman/fman_port.c @@ -1792,7 +1792,7 @@ static int fman_port_probe(struct platform_device *of_dev) if (!fm_node) { dev_err(port->dev, "%s: of_get_parent() failed\n", __func__); err = -ENODEV; - goto free_port; + goto put_node; } fm_pdev = of_find_device_by_node(fm_node); @@ -1899,7 +1899,6 @@ static int fman_port_probe(struct platform_device *of_dev) put_device(&fm_pdev->dev); put_node: of_node_put(port_node); -free_port: kfree(port); return err; } -- 2.25.4