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;
 }