From d0cdad6bfaf00af8cc48e4a13df7f47f8ddfe86b Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 5 Mar 2012 15:07:25 -0800 Subject: [PATCH] --- yaml --- r: 288591 b: refs/heads/master c: a09b659cd68c10ec6a30cb91ebd2c327fcd5bfe5 h: refs/heads/master i: 288589: 58407e01a97f74bd64eb2555f9e8488c7cea3196 288587: a7191494c19bb95e1dcb8d6951a75785a7c3d4e2 288583: 54d13724d2acec10f0e5e0047e5cf4b66a031382 288575: 3bcbab84e01f31cb705d875085b5ceda716b276e v: v3 --- [refs] | 2 +- trunk/kernel/irq/chip.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 386b683b48bf..2a3e28dd72f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 986cb48c5a4de0085db94d343b4e7dcf54355ec1 +refs/heads/master: a09b659cd68c10ec6a30cb91ebd2c327fcd5bfe5 diff --git a/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c index f7c543a801d9..4dbc9c9d641b 100644 --- a/trunk/kernel/irq/chip.c +++ b/trunk/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; }