Merge tag 'v3.18-rc3' into asoc-sgtl5000

Linux 3.18-rc3

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 2133f9d59d06..43005d4d3348 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -660,11 +660,11 @@ static bool __init
 arch_timer_probed(int type, const struct of_device_id *matches)
 {
         struct device_node *dn;
-        bool probed = false;
+        bool probed = true;
 
         dn = of_find_matching_node(NULL, matches);
-        if (dn && of_device_is_available(dn) && (arch_timers_present & type))
-                probed = true;
+        if (dn && of_device_is_available(dn) && !(arch_timers_present & type))
+                probed = false;
         of_node_put(dn);
 
         return probed;