Merge "pinctrl: msm: set irq's flow type with controller extension always"

This commit is contained in:
Linux Build Service Account 2014-06-26 12:30:18 -07:00 committed by Gerrit - the friendly Code Review server
commit baed6b1ab5
1 changed files with 2 additions and 4 deletions

View File

@ -658,10 +658,8 @@ static int msm_tlmm_irq_set_type(struct irq_data *d, unsigned int flow_type)
mb();
spin_unlock_irqrestore(&ic->irq_lock, irq_flags);
if ((flow_type & IRQ_TYPE_EDGE_BOTH) != IRQ_TYPE_EDGE_BOTH) {
if (ic->irq_chip_extn->irq_set_type)
ic->irq_chip_extn->irq_set_type(d, flow_type);
}
if (ic->irq_chip_extn->irq_set_type)
ic->irq_chip_extn->irq_set_type(d, flow_type);
return 0;
}