diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-28 12:23:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-28 12:23:12 -0700 |
| commit | f3866db8f7534ba8bbb342bebcf5ede542035528 (patch) | |
| tree | f73e761ac85faea698eb6ab700361ef199aa68c7 | |
| parent | f014d937d61f47761f961eba903feb2ffa1793aa (diff) | |
| parent | 4673247562e39a17e09440fa1400819522ccd446 (diff) | |
| download | linux-3.10-f3866db8f7534ba8bbb342bebcf5ede542035528.tar.gz linux-3.10-f3866db8f7534ba8bbb342bebcf5ede542035528.tar.bz2 linux-3.10-f3866db8f7534ba8bbb342bebcf5ede542035528.zip | |
Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
genirq: Deal with desc->set_type() changing desc->chip
| -rw-r--r-- | kernel/irq/manage.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 3164ba7ce15..e1497481fe8 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -456,6 +456,9 @@ int __irq_set_trigger(struct irq_desc *desc, unsigned int irq, /* note that IRQF_TRIGGER_MASK == IRQ_TYPE_SENSE_MASK */ desc->status &= ~(IRQ_LEVEL | IRQ_TYPE_SENSE_MASK); desc->status |= flags; + + if (chip != desc->chip) + irq_chip_set_defaults(desc->chip); } return ret; |