| commit | e9baa79ea038ac2dfd3c8eb3ec33b9c4e8101b25 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Mon Oct 24 03:04:12 2011 -0700 |
| committer | QuIC Gerrit Code Review <code-review@localhost> | Mon Oct 24 03:04:12 2011 -0700 |
| tree | e05fd0f8c920de87dbf17a59acf49e4467d8c424 | |
| parent | 74e902972e0a0d207dbcc4b50c5c2720404294bf [diff] | |
| parent | b615b0e3d4661277cfef5e94957dfa62b4d94bb9 [diff] |
Merge "genirq: chip: set pending only for edge interrupts" into msm-3.0
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index dc154f2..45e149c 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c
@@ -396,7 +396,8 @@ * then mask it and get out of here: */ if (unlikely(!desc->action || irqd_irq_disabled(&desc->irq_data))) { - desc->istate |= IRQS_PENDING; + if (!irq_settings_is_level(desc)) + desc->istate |= IRQS_PENDING; mask_irq(desc); goto out; }