diff --git a/[refs] b/[refs]
index a13bc547ec2b..dfc234e2ac14 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed4dea6e0e33a3e58d8b77b775a8f0e433e7a005
+refs/heads/master: 8fff39e06987492da3d4a0b9ec7cdbd245b6762b
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
index 6cca1956c503..01f8a9519e63 100644
--- a/trunk/kernel/irq/manage.c
+++ b/trunk/kernel/irq/manage.c
@@ -567,6 +567,7 @@ int __irq_set_trigger(struct irq_desc *desc, unsigned int irq,
 		if (chip != desc->irq_data.chip)
 			irq_chip_set_defaults(desc->irq_data.chip);
 		ret = 0;
+		break;
 	default:
 		pr_err("setting trigger mode %lu for irq %u failed (%pF)\n",
 		       flags, irq, chip->irq_set_type);