Merge 3.8-rc5 into tty-next

This resolves a number of tty driver merge issues found in linux-next

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 2 insertions, 6 deletions

diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 691aa674665a..b8ad6e632bb8 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/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;