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=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham 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 45396C433DF for ; Fri, 3 Jul 2020 01:15:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 21D8720747 for ; Fri, 3 Jul 2020 01:15:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726245AbgGCBPa (ORCPT ); Thu, 2 Jul 2020 21:15:30 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:58708 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725937AbgGCBPa (ORCPT ); Thu, 2 Jul 2020 21:15:30 -0400 Received: from DGGEMS404-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 665A31DEC41B43F5BBE2; Fri, 3 Jul 2020 09:15:27 +0800 (CST) Received: from [127.0.0.1] (10.174.179.103) by DGGEMS404-HUB.china.huawei.com (10.3.19.204) with Microsoft SMTP Server id 14.3.487.0; Fri, 3 Jul 2020 09:15:21 +0800 Subject: Re: [PATCH] ARM: at91: pm: add missing put_device() call in at91_pm_sram_init() To: Alexandre Belloni CC: , , , , , References: <20200604123301.3905837-1-yukuai3@huawei.com> <20200702200915.GC6538@piout.net> From: "yukuai (C)" Message-ID: <01fd6279-524e-3cee-4c16-5b748a49d0f0@huawei.com> Date: Fri, 3 Jul 2020 09:15:20 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20200702200915.GC6538@piout.net> Content-Type: text/plain; charset="gbk"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.179.103] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2020/7/3 4:09, Alexandre Belloni wrote: > Hi, > > On 04/06/2020 20:33:01+0800, yu kuai wrote: >> if of_find_device_by_node() succeed, at91_pm_sram_init() doesn't have >> a corresponding put_device(). Thus add a jump target to fix the exception >> handling for this function implementation. >> >> Fixes: d2e467905596 ("ARM: at91: pm: use the mmio-sram pool to access SRAM") >> Signed-off-by: yu kuai >> --- >> arch/arm/mach-at91/pm.c | 11 ++++++++--- >> 1 file changed, 8 insertions(+), 3 deletions(-) >> >> diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c >> index 074bde64064e..2aab043441e8 100644 >> --- a/arch/arm/mach-at91/pm.c >> +++ b/arch/arm/mach-at91/pm.c >> @@ -592,13 +592,13 @@ static void __init at91_pm_sram_init(void) >> sram_pool = gen_pool_get(&pdev->dev, NULL); > > Isn't the best solution to simply have put_device hereHi, Alexandre ! I think put_device() is supposed to be called in the exception handling path. > >> if (!sram_pool) { >> pr_warn("%s: sram pool unavailable!\n", __func__); >> - return; >> + goto out_put_device; >> } >> >> sram_base = gen_pool_alloc(sram_pool, at91_pm_suspend_in_sram_sz); >> if (!sram_base) { >> pr_warn("%s: unable to alloc sram!\n", __func__); >> - return; >> + goto out_put_device; >> } >> >> sram_pbase = gen_pool_virt_to_phys(sram_pool, sram_base); >> @@ -606,12 +606,17 @@ static void __init at91_pm_sram_init(void) >> at91_pm_suspend_in_sram_sz, false); >> if (!at91_suspend_sram_fn) { >> pr_warn("SRAM: Could not map\n"); >> - return; >> + goto out_put_device; >> } >> >> /* Copy the pm suspend handler to SRAM */ >> at91_suspend_sram_fn = fncpy(at91_suspend_sram_fn, >> &at91_pm_suspend_in_sram, at91_pm_suspend_in_sram_sz); If nothing is wrong, maybe put_device shounld't be called? Thanks! Yu Kuai >> + return; >> + >> +out_put_device: >> + put_device(&pdev->dev); >> + return; >> } >> >> static bool __init at91_is_pm_mode_active(int pm_mode) >> -- >> 2.25.4 >> >