1 files changed, 8 insertions, 7 deletions

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index d663338cb4a8..5203a599d211 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -111,9 +111,9 @@ int set_irq_chip(unsigned int irq, struct irq_chip *chip)
 EXPORT_SYMBOL(set_irq_chip);
 
 /**
- *      set_irq_type - set the irq type for an irq
+ *      set_irq_type - set the irq trigger type for an irq
  *      @irq:   irq number
- *      @type:  interrupt type - see include/linux/interrupt.h
+ *      @type:  IRQ_TYPE_{LEVEL,EDGE}_* value - see include/linux/irq.h
  */
 int set_irq_type(unsigned int irq, unsigned int type)
 {
@@ -127,11 +127,12 @@ int set_irq_type(unsigned int irq, unsigned int type)
         }
 
         desc = irq_desc + irq;
-        if (desc->chip->set_type) {
-                spin_lock_irqsave(&desc->lock, flags);
-                ret = desc->chip->set_type(irq, type);
-                spin_unlock_irqrestore(&desc->lock, flags);
-        }
+        if (type == IRQ_TYPE_NONE)
+                return 0;
+
+        spin_lock_irqsave(&desc->lock, flags);
+        ret = __irq_set_trigger(desc, irq, flags);
+        spin_unlock_irqrestore(&desc->lock, flags);
         return ret;
 }
 EXPORT_SYMBOL(set_irq_type);