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=-11.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 7211DC388F7 for ; Mon, 9 Nov 2020 12:02:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 211ED20789 for ; Mon, 9 Nov 2020 12:02:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729537AbgKIMCe (ORCPT ); Mon, 9 Nov 2020 07:02:34 -0500 Received: from szxga03-in.huawei.com ([45.249.212.189]:2366 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726410AbgKIMCd (ORCPT ); Mon, 9 Nov 2020 07:02:33 -0500 Received: from dggeme755-chm.china.huawei.com (unknown [172.30.72.56]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4CV8kN5hRxz52X9; Mon, 9 Nov 2020 20:02:20 +0800 (CST) Received: from [10.140.157.68] (10.140.157.68) by dggeme755-chm.china.huawei.com (10.3.19.101) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1913.5; Mon, 9 Nov 2020 20:02:30 +0800 Subject: Re: [PATCH V2] clk: hisilicon: Free clk_data and unmap region obtained by of_iomap To: , , , , Markus Elfring References: <20201109180920.43193-1-gengdongjiu@huawei.com> From: Dongjiu Geng Message-ID: Date: Mon, 9 Nov 2020 20:02:28 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <20201109180920.43193-1-gengdongjiu@huawei.com> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.140.157.68] X-ClientProxiedBy: dggeme710-chm.china.huawei.com (10.1.199.106) To dggeme755-chm.china.huawei.com (10.3.19.101) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org add Markus On 2020/11/10 2:09, Dongjiu Geng wrote: > Free memory mapping and free clk_data, if clock initialization > is not successful. > > Fixes: 75af25f581b1 ("clk: hisi: remove static variable") > Fixes: 62ac983b6141 ("clk: hisilicon: add hi3620_mmc_clks") > Signed-off-by: Dongjiu Geng > --- > drivers/clk/hisilicon/clk-hi3620.c | 8 ++++++-- > drivers/clk/hisilicon/clk.c | 11 ++++++----- > 2 files changed, 12 insertions(+), 7 deletions(-) > > diff --git a/drivers/clk/hisilicon/clk-hi3620.c b/drivers/clk/hisilicon/clk-hi3620.c > index a3d04c7c3da8..864d2ddfc73c 100644 > --- a/drivers/clk/hisilicon/clk-hi3620.c > +++ b/drivers/clk/hisilicon/clk-hi3620.c > @@ -464,11 +464,11 @@ static void __init hi3620_mmc_clk_init(struct device_node *node) > > clk_data = kzalloc(sizeof(*clk_data), GFP_KERNEL); > if (WARN_ON(!clk_data)) > - return; > + goto unmap_io; > > clk_data->clks = kcalloc(num, sizeof(*clk_data->clks), GFP_KERNEL); > if (!clk_data->clks) > - return; > + goto free_clk_data; > > for (i = 0; i < num; i++) { > struct hisi_mmc_clock *mmc_clk = &hi3620_mmc_clks[i]; > @@ -478,6 +478,10 @@ static void __init hi3620_mmc_clk_init(struct device_node *node) > > clk_data->clk_num = num; > of_clk_add_provider(node, of_clk_src_onecell_get, clk_data); > +free_clk_data: > + kfree(clk_data); > +unmap_io: > + iounmap(base); > } > > CLK_OF_DECLARE(hi3620_mmc_clk, "hisilicon,hi3620-mmc-clock", hi3620_mmc_clk_init); > diff --git a/drivers/clk/hisilicon/clk.c b/drivers/clk/hisilicon/clk.c > index 54d9fdc93599..da655683710f 100644 > --- a/drivers/clk/hisilicon/clk.c > +++ b/drivers/clk/hisilicon/clk.c > @@ -65,25 +65,26 @@ struct hisi_clock_data *hisi_clk_init(struct device_node *np, > base = of_iomap(np, 0); > if (!base) { > pr_err("%s: failed to map clock registers\n", __func__); > - goto err; > + return NULL; > } > > clk_data = kzalloc(sizeof(*clk_data), GFP_KERNEL); > if (!clk_data) > - goto err; > + goto unmap_io; > > clk_data->base = base; > clk_table = kcalloc(nr_clks, sizeof(*clk_table), GFP_KERNEL); > if (!clk_table) > - goto err_data; > + goto free_clk_data; > > clk_data->clk_data.clks = clk_table; > clk_data->clk_data.clk_num = nr_clks; > of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data->clk_data); > return clk_data; > -err_data: > +free_clk_data: > kfree(clk_data); > -err: > +unmap_io: > + iounmap(base); > return NULL; > } > EXPORT_SYMBOL_GPL(hisi_clk_init); >