From 11693b88727cf231c49b1f6003a7a2d129fef9e8 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Thu, 9 Aug 2012 16:53:54 +0100 Subject: [PATCH] --- yaml --- r: 329967 b: refs/heads/master c: 0a37fc56888c37049f60aab398fddceafd33fe72 h: refs/heads/master i: 329965: 81c6626609f03a981c57558b508f61dc7b834c07 329963: b2d54596c6dd6d8b064e9d4e7eec51ac25712dde 329959: df782a41a791066068b26c3db44e659bdf4fa845 329951: 3276099fd38be5de81923288f49c2e2419078f92 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/ab8500-core.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f7883521825f..39fd3ff5f0f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4adcefd3f908f02a5266cb37d82dc34615edbd3b +refs/heads/master: 0a37fc56888c37049f60aab398fddceafd33fe72 diff --git a/trunk/drivers/mfd/ab8500-core.c b/trunk/drivers/mfd/ab8500-core.c index dd91951c68f0..a3aceffb60fe 100644 --- a/trunk/drivers/mfd/ab8500-core.c +++ b/trunk/drivers/mfd/ab8500-core.c @@ -517,8 +517,9 @@ static irqreturn_t ab8500_irq(int irq, void *dev) do { int bit = __ffs(value); int line = i * 8 + bit; + int virq = ab8500_irq_get_virq(ab8500, line); - handle_nested_irq(ab8500->irq_base + line); + handle_nested_irq(virq); value &= ~(1 << bit); } while (value);