From e44c826b960024d79dd0011f49d2bb398fff0842 Mon Sep 17 00:00:00 2001 From: Pantelis Antoniou Date: Tue, 8 Jan 2013 15:31:42 +0200 Subject: [PATCH] --- yaml --- r: 349114 b: refs/heads/master c: 034bf091b7a5f02e63409b0b5b6dad1101d70144 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/timer.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 1517e71fd9f7..4436e48c92bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e407ee099a1d3d80b63123491c81ca7de9d77ad9 +refs/heads/master: 034bf091b7a5f02e63409b0b5b6dad1101d70144 diff --git a/trunk/arch/arm/mach-omap2/timer.c b/trunk/arch/arm/mach-omap2/timer.c index 691aa674665a..b8ad6e632bb8 100644 --- a/trunk/arch/arm/mach-omap2/timer.c +++ b/trunk/arch/arm/mach-omap2/timer.c @@ -165,15 +165,11 @@ static struct device_node * __init omap_get_timer_dt(struct of_device_id *match, struct device_node *np; for_each_matching_node(np, match) { - if (!of_device_is_available(np)) { - of_node_put(np); + if (!of_device_is_available(np)) continue; - } - if (property && !of_get_property(np, property, NULL)) { - of_node_put(np); + if (property && !of_get_property(np, property, NULL)) continue; - } of_add_property(np, &device_disabled); return np;