From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965901AbcIWL6J (ORCPT ); Fri, 23 Sep 2016 07:58:09 -0400 Received: from mail-pa0-f67.google.com ([209.85.220.67]:32838 "EHLO mail-pa0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964954AbcIWL6I (ORCPT ); Fri, 23 Sep 2016 07:58:08 -0400 From: Arvind Yadav To: baohua@kernel.org, daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org Subject: [PATCH V3] clocksource/timer-imx-gpt: Preventing resource leakage in error case. Date: Fri, 23 Sep 2016 17:27:54 +0530 Message-Id: <1474631874-5777-1-git-send-email-arvind.yadav.cs@gmail.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 -Free previously allocated memory. -Unmap I/O memory from kernel address space. Signed-off-by: Arvind Yadav --- drivers/clocksource/timer-imx-gpt.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c index f595460..31cfccf 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_free; + } imxtm->irq = irq_of_parse_and_map(np, 0); - if (imxtm->irq <= 0) - return -EINVAL; + if (imxtm->irq <= 0) { + ret = -EINVAL; + goto error_iounmap; + } imxtm->clk_ipg = of_clk_get_by_name(np, "ipg"); @@ -506,12 +510,19 @@ static int __init mxc_timer_init_dt(struct device_node *np, enum imx_gpt_type t imxtm->type = type; ret = _mxc_timer_init(imxtm); - if (ret) - return ret; + if (ret) { + goto error_iounmap; + } initialized = 1; return 0; + +error_iounmap: + iounmap(imxtm->base); +error_kfree: + kfree(imxtm); + return ret; } static int __init imx1_timer_init_dt(struct device_node *np) -- 2.7.4