diff options
| author | Clark Williams <williams@redhat.com> | 2012-04-04 10:52:26 -0500 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-04 10:52:26 -0500 |
| commit | 2d93eaf2d4ace5853a74a4b0596f601aa62cb840 (patch) | |
| tree | b0a2e2083c1749c4e3b8ae23db7bb13a7ca9aafe /kernel/irq/chip.c | |
| parent | 003133585fc61d7bd36d3a097d7fde62e64a9550 (diff) | |
| parent | 23d8c3f8f494c8516c9b4c05529e118e6a485956 (diff) | |
Merge commit 'v3.2.14' into rt-3.2.14-rt23v3.2.14-rt23
Diffstat (limited to 'kernel/irq/chip.c')
| -rw-r--r-- | kernel/irq/chip.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index fb7db75ee0c8..25784d630a12 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -61,8 +61,7 @@ int irq_set_irq_type(unsigned int irq, unsigned int type) return -EINVAL; type &= IRQ_TYPE_SENSE_MASK; - if (type != IRQ_TYPE_NONE) - ret = __irq_set_trigger(desc, irq, type); + ret = __irq_set_trigger(desc, irq, type); irq_put_desc_busunlock(desc, flags); return ret; } |