| Message ID | 1441336900-15095-3-git-send-email-alexey.klimov@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
On 04/09/15 05:21, Alexey Klimov wrote: > Add error path to clear evt struct allocated by kzalloc() > in the beginning of function mtk_timer_init(). > > Signed-off-by: Alexey Klimov <alexey.klimov@linaro.org> > --- > drivers/clocksource/mtk_timer.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/clocksource/mtk_timer.c b/drivers/clocksource/mtk_timer.c > index fbaacbf..9c5a2cc 100644 > --- a/drivers/clocksource/mtk_timer.c > +++ b/drivers/clocksource/mtk_timer.c > @@ -201,7 +201,7 @@ static void __init mtk_timer_init(struct device_node *node) > evt->gpt_base = of_io_request_and_map(node, 0, "mtk-timer"); > if (IS_ERR(evt->gpt_base)) { > pr_err("Can't get resource\n"); > - return; > + goto err_kzalloc; > } > > evt->dev.irq = irq_of_parse_and_map(node, 0); > @@ -256,5 +256,7 @@ err_mem: > iounmap(evt->gpt_base); > of_address_to_resource(node, 0, &res); > release_mem_region(res.start, resource_size(&res)); > +err_kzalloc: > + kfree(evt); > } > CLOCKSOURCE_OF_DECLARE(mtk_mt6577, "mediatek,mt6577-timer", mtk_timer_init); > Acked-by: Matthias Brugger <matthias.bgg@gmail.com> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
diff --git a/drivers/clocksource/mtk_timer.c b/drivers/clocksource/mtk_timer.c index fbaacbf..9c5a2cc 100644 --- a/drivers/clocksource/mtk_timer.c +++ b/drivers/clocksource/mtk_timer.c @@ -201,7 +201,7 @@ static void __init mtk_timer_init(struct device_node *node) evt->gpt_base = of_io_request_and_map(node, 0, "mtk-timer"); if (IS_ERR(evt->gpt_base)) { pr_err("Can't get resource\n"); - return; + goto err_kzalloc; } evt->dev.irq = irq_of_parse_and_map(node, 0); @@ -256,5 +256,7 @@ err_mem: iounmap(evt->gpt_base); of_address_to_resource(node, 0, &res); release_mem_region(res.start, resource_size(&res)); +err_kzalloc: + kfree(evt); } CLOCKSOURCE_OF_DECLARE(mtk_mt6577, "mediatek,mt6577-timer", mtk_timer_init);
Add error path to clear evt struct allocated by kzalloc() in the beginning of function mtk_timer_init(). Signed-off-by: Alexey Klimov <alexey.klimov@linaro.org> --- drivers/clocksource/mtk_timer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)