1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index d617ee5a3d8a..4634cf7d0ec3 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -188,12 +188,15 @@ static int gic_set_type(struct irq_data *d, unsigned int type)
 {
         void __iomem *base = gic_dist_base(d);
         unsigned int gicirq = gic_irq(d);
+        int ret;
 
         /* Interrupt configuration for SGIs can't be changed */
         if (gicirq < 16)
                 return -EINVAL;
 
-        if (type != IRQ_TYPE_LEVEL_HIGH && type != IRQ_TYPE_EDGE_RISING)
+        /* SPIs have restrictions on the supported types */
+        if (gicirq >= 32 && type != IRQ_TYPE_LEVEL_HIGH &&
+                            type != IRQ_TYPE_EDGE_RISING)
                 return -EINVAL;
 
         raw_spin_lock(&irq_controller_lock);
@@ -201,11 +204,11 @@ static int gic_set_type(struct irq_data *d, unsigned int type)
         if (gic_arch_extn.irq_set_type)
                 gic_arch_extn.irq_set_type(d, type);
 
-        gic_configure_irq(gicirq, type, base, NULL);
+        ret = gic_configure_irq(gicirq, type, base, NULL);
 
         raw_spin_unlock(&irq_controller_lock);
 
-        return 0;
+        return ret;
 }
 
 static int gic_retrigger(struct irq_data *d)