From 6bfee7953e9ab09d78db229d5b6462d043b81753 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Fri, 4 Jan 2013 16:32:54 +0000 Subject: [PATCH] --- yaml --- r: 350377 b: refs/heads/master c: 33be49324f7f3e9dff10d3d07a5c78ee82f8d54e h: refs/heads/master i: 350375: d3780fa6b1ec304d55cdf43b5612bce5b11cf0f2 v: v3 --- [refs] | 2 +- trunk/drivers/base/regmap/regmap-irq.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ae7b5924d244..5e4b4c16edf9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7440eaa90cf2659920b9b28973cc1a13a2b331f +refs/heads/master: 33be49324f7f3e9dff10d3d07a5c78ee82f8d54e diff --git a/trunk/drivers/base/regmap/regmap-irq.c b/trunk/drivers/base/regmap/regmap-irq.c index aaf599a320b3..be5579964be0 100644 --- a/trunk/drivers/base/regmap/regmap-irq.c +++ b/trunk/drivers/base/regmap/regmap-irq.c @@ -88,6 +88,17 @@ static void regmap_irq_sync_unlock(struct irq_data *data) if (ret != 0) dev_err(d->map->dev, "Failed to sync masks in %x\n", reg); + + reg = d->chip->wake_base + + (i * map->reg_stride * d->irq_reg_stride); + if (d->wake_buf) { + ret = regmap_update_bits(d->map, reg, + d->mask_buf_def[i], d->wake_buf[i]); + if (ret != 0) + dev_err(d->map->dev, + "Failed to sync wakes in %x: %d\n", + reg, ret); + } } if (d->chip->runtime_pm)