Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 349114
b: refs/heads/master
c: 034bf09
h: refs/heads/master
v: v3
  • Loading branch information
Pantelis Antoniou authored and Tony Lindgren committed Jan 21, 2013
1 parent 351763d commit e44c826
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e407ee099a1d3d80b63123491c81ca7de9d77ad9
refs/heads/master: 034bf091b7a5f02e63409b0b5b6dad1101d70144
8 changes: 2 additions & 6 deletions trunk/arch/arm/mach-omap2/timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit e44c826

Please sign in to comment.