From 60a42ae68cd46d2d2c0ebd65fc0945ed25f2838e Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Thu, 17 May 2012 13:59:40 +0100 Subject: [PATCH] --- yaml --- r: 302089 b: refs/heads/master c: 38e7f5d1b73e71f87745a9c3e5806a6c28c34a53 h: refs/heads/master i: 302087: c31d61a8c8a48da763d006189893cd7ef926568c v: v3 --- [refs] | 2 +- trunk/drivers/base/regmap/regmap-irq.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6d80371ef5a3..282044e6116b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6550334f96ab02e540572a142d0851c7f3120585 +refs/heads/master: 38e7f5d1b73e71f87745a9c3e5806a6c28c34a53 diff --git a/trunk/drivers/base/regmap/regmap-irq.c b/trunk/drivers/base/regmap/regmap-irq.c index 502cbdbab638..4fac4b9be88f 100644 --- a/trunk/drivers/base/regmap/regmap-irq.c +++ b/trunk/drivers/base/regmap/regmap-irq.c @@ -116,7 +116,7 @@ static irqreturn_t regmap_irq_thread(int irq, void *d) * doing a write per register. */ for (i = 0; i < data->chip->num_regs; i++) { - ret = regmap_read(map, chip->mask_base + (i * map->reg_stride + ret = regmap_read(map, chip->status_base + (i * map->reg_stride * data->irq_reg_stride), &data->status_buf[i]);