diff --git a/[refs] b/[refs]
index 99260d18d671..8a56d78f0369 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca142750f8ac3d01e45909e624ca783779894640
+refs/heads/master: 685879f4b2036e58c1a0cdaaee2b155d3c965461
diff --git a/trunk/drivers/base/regmap/regmap-irq.c b/trunk/drivers/base/regmap/regmap-irq.c
index bf1203cbd122..9a6649c82daa 100644
--- a/trunk/drivers/base/regmap/regmap-irq.c
+++ b/trunk/drivers/base/regmap/regmap-irq.c
@@ -287,6 +287,11 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
 
 	d->irq_chip = regmap_irq_chip;
 	d->irq_chip.name = chip->name;
+	if (!chip->wake_base) {
+		d->irq_chip.irq_set_wake = NULL;
+		d->irq_chip.flags |= IRQCHIP_MASK_ON_SUSPEND |
+				     IRQCHIP_SKIP_SET_WAKE;
+	}
 	d->irq = irq;
 	d->map = map;
 	d->chip = chip;