Merge commit 3669ef9fa7d3 ("x86, tls: Interpret an all-zero struct user_desc as 'no segment'") into x86/asm

Pick up the latestest asm fixes before advancing it any further.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
index 860da40b78ef..0ce5e2d65a06 100644
--- a/drivers/bus/arm-cci.c
+++ b/drivers/bus/arm-cci.c
@@ -1312,6 +1312,9 @@ static int cci_probe(void)
         if (!np)
                 return -ENODEV;
 
+        if (!of_device_is_available(np))
+                return -ENODEV;
+
         cci_config = of_match_node(arm_cci_matches, np)->data;
         if (!cci_config)
                 return -ENODEV;