I reversed these two checks so we check "root_irq_data" for NULL before
dereferencing it.

Signed-off-by: Dan Carpenter <[email protected]>

diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index b9c688944429..e84b7056bb08 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -1505,10 +1505,10 @@ int irq_domain_push_irq(struct irq_domain *domain, int 
virq, void *arg)
        if (WARN_ON(!irq_domain_is_hierarchy(domain)))
                return -EINVAL;
 
-       if (domain->parent != root_irq_data->domain)
+       if (!root_irq_data)
                return -EINVAL;
 
-       if (!root_irq_data)
+       if (domain->parent != root_irq_data->domain)
                return -EINVAL;
 
        child_irq_data = kzalloc_node(sizeof(*child_irq_data), GFP_KERNEL,

Reply via email to