From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754224AbdEEMwy (ORCPT ); Fri, 5 May 2017 08:52:54 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:36162 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751437AbdEEMww (ORCPT ); Fri, 5 May 2017 08:52:52 -0400 From: Arvind Yadav To: nicolas.ferre@atmel.com, tglx@linutronix.de, daniel.lezcano@linaro.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH v1] clocksource/timer-atmel-pit:- Fix resource leaks in error paths. Date: Fri, 5 May 2017 18:21:48 +0530 Message-Id: <1493988708-13696-1-git-send-email-arvind.yadav.cs@gmail.com> 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 Signed-off-by: Arvind Yadav --- drivers/clocksource/timer-atmel-pit.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c index c0b5df3..28b0cd3 100644 --- a/drivers/clocksource/timer-atmel-pit.c +++ b/drivers/clocksource/timer-atmel-pit.c @@ -180,26 +180,29 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node) data->base = of_iomap(node, 0); if (!data->base) { pr_err("Could not map PIT address\n"); - return -ENXIO; + ret = -ENXIO; + goto error_free; } data->mck = of_clk_get(node, 0); if (IS_ERR(data->mck)) { pr_err("Unable to get mck clk\n"); - return PTR_ERR(data->mck); + ret = PTR_ERR(data->mck); + goto error_iounmap; } ret = clk_prepare_enable(data->mck); if (ret) { pr_err("Unable to enable mck\n"); - return ret; + goto error_clk_put; } /* Get the interrupts property */ data->irq = irq_of_parse_and_map(node, 0); if (!data->irq) { pr_err("Unable to get IRQ from DT\n"); - return -EINVAL; + ret = -EINVAL; + goto error_clk_disable; } /* @@ -223,11 +226,11 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node) data->clksrc.rating = 175; data->clksrc.read = read_pit_clk; data->clksrc.flags = CLOCK_SOURCE_IS_CONTINUOUS; - + ret = clocksource_register_hz(&data->clksrc, pit_rate); if (ret) { pr_err("Failed to register clocksource"); - return ret; + goto error_clk_disable; } /* Set up irq handler */ @@ -236,7 +239,7 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node) "at91_tick", data); if (ret) { pr_err("Unable to setup IRQ\n"); - return ret; + goto error_unregister_clk; } /* Set up and register clockevents */ @@ -254,6 +257,19 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node) clockevents_register_device(&data->clkevt); return 0; + +error_unregister_clk: + clocksource_unregister(&data->clksrc); +error_clk_disable: + clk_disable_unprepare(data->mck); +error_clk_put: + clk_put(data->mck); +error_iounmap: + iounmap(data->base); +error_free: + kfree(data); + + return ret; } CLOCKSOURCE_OF_DECLARE(at91sam926x_pit, "atmel,at91sam9260-pit", at91sam926x_pit_dt_init); -- 1.9.1