Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6

[karo-tx-linux.git] / kernel / irq / chip.c

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index de210f4b7a929b9cb911d13c4eee2b23679c5fdd..6eb3c7952b6496fc9c5f8da49b982d79866e1504 100644 (file)
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -125,6 +125,7 @@ int set_irq_type(unsigned int irq, unsigned int type)
                return -ENODEV;
        }
 
+       type &= IRQ_TYPE_SENSE_MASK;
        if (type == IRQ_TYPE_NONE)
                return 0;