From 21bf6668c9f54d18c212b176fc0e29ce25f01e9a Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Wed, 1 Aug 2012 11:40:49 -0600
Subject: [PATCH] --- yaml --- r: 323295 b: refs/heads/master c:
 685879f4b2036e58c1a0cdaaee2b155d3c965461 h: refs/heads/master i:   323293:
 892193706fb5025c3e39d2dd711c1df2c7966fae   323291:
 288de6999380f35b00c0fa1d29d4bbf9a59b175c   323287:
 3e33666761af9d4644382deeced768bb93be84f7   323279:
 3250c4faaf63bf81397773190bd22a2927f077f3   323263:
 3631d63d7ffacb94f174fc8eadf6f753f06af9ae v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/base/regmap/regmap-irq.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

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;