Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751855AbdF1GOn (ORCPT ); Wed, 28 Jun 2017 02:14:43 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:32769 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751460AbdF1GOg (ORCPT ); Wed, 28 Jun 2017 02:14:36 -0400 From: Arvind Yadav To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org Subject: [PATCH] clocksource: timer-imx-gpt: Free and unmap region obtained by kzalloc/of_iomap. Date: Wed, 28 Jun 2017 11:43:47 +0530 Message-Id: X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1268 Lines: 52 In case of error at init time, rollback iomapping and kfree. Signed-off-by: Arvind Yadav --- drivers/clocksource/timer-imx-gpt.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c index f595460..1a8786c 100644 --- a/drivers/clocksource/timer-imx-gpt.c +++ b/drivers/clocksource/timer-imx-gpt.c @@ -489,12 +489,16 @@ static int __init mxc_timer_init_dt(struct device_node *np, enum imx_gpt_type t return -ENOMEM; imxtm->base = of_iomap(np, 0); - if (!imxtm->base) - return -ENXIO; + if (!imxtm->base) { + ret = -ENXIO; + goto error; + } imxtm->irq = irq_of_parse_and_map(np, 0); - if (imxtm->irq <= 0) - return -EINVAL; + if (imxtm->irq <= 0) { + ret = -EINVAL; + goto error_free; + } imxtm->clk_ipg = of_clk_get_by_name(np, "ipg"); @@ -507,11 +511,16 @@ static int __init mxc_timer_init_dt(struct device_node *np, enum imx_gpt_type t ret = _mxc_timer_init(imxtm); if (ret) - return ret; + goto error_free; initialized = 1; return 0; +error_free: + iounmap(imxtm->base); +error: + kfree(imxtm); + return ret; } static int __init imx1_timer_init_dt(struct device_node *np) -- 1.9.1