1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index 1a146ccee701..6e508038f31b 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -238,7 +238,9 @@ static int gic_set_type(struct irq_data *d, unsigned int type)
         if (irq < 16)
                 return -EINVAL;
 
-        if (type != IRQ_TYPE_LEVEL_HIGH && type != IRQ_TYPE_EDGE_RISING)
+        /* SPIs have restrictions on the supported types */
+        if (irq >= 32 && type != IRQ_TYPE_LEVEL_HIGH &&
+                         type != IRQ_TYPE_EDGE_RISING)
                 return -EINVAL;
 
         if (gic_irq_in_rdist(d)) {
@@ -249,9 +251,7 @@ static int gic_set_type(struct irq_data *d, unsigned int type)
                 rwp_wait = gic_dist_wait_for_rwp;
         }
 
-        gic_configure_irq(irq, type, base, rwp_wait);
-
-        return 0;
+        return gic_configure_irq(irq, type, base, rwp_wait);
 }
 
 static u64 gic_mpidr_to_affinity(u64 mpidr)