Merge tag 'mips_6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

[platform/kernel/linux-rpi.git] / kernel / irq / ipi.c

diff --git a/kernel/irq/ipi.c b/kernel/irq/ipi.c
index bbd945b..961d4af 100644 (file)
--- a/kernel/irq/ipi.c
+++ b/kernel/irq/ipi.c
@@ -188,9 +188,9 @@ EXPORT_SYMBOL_GPL(ipi_get_hwirq);
 static int ipi_send_verify(struct irq_chip *chip, struct irq_data *data,
                           const struct cpumask *dest, unsigned int cpu)
 {
-       const struct cpumask *ipimask = irq_data_get_affinity_mask(data);
+       const struct cpumask *ipimask;
 
-       if (!chip || !ipimask)
+       if (!chip || !data)
                return -EINVAL;
 
        if (!chip->ipi_send_single && !chip->ipi_send_mask)
@@ -199,6 +199,10 @@ static int ipi_send_verify(struct irq_chip *chip, struct irq_data *data,
        if (cpu >= nr_cpu_ids)
                return -EINVAL;
 
+       ipimask = irq_data_get_affinity_mask(data);
+       if (!ipimask)
+               return -EINVAL;
+
        if (dest) {
                if (!cpumask_subset(dest, ipimask))
                        return -EINVAL;