From f9bf73a62b77aad9366fa72cc34b7286a6bb6ac2 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 3 Jul 2008 11:08:27 +0200 Subject: [PATCH] --- yaml --- r: 104071 b: refs/heads/master c: de0d23c12c42317c273919b597f6822af2102e55 h: refs/heads/master i: 104069: a7644d1f411e16f2c2d87ae416a56c95353b7a5d 104067: c61dca26be793c60958ab6a1a9bedf39b5662123 104063: c86afbccd6c7c2b4401a667d30f1d90466f02e1c v: v3 --- [refs] | 2 +- trunk/drivers/mfd/asic3.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 791a2e250130..b4743fb5ecfa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30250b457f30ca655d37ad1a1587221ff6eefc91 +refs/heads/master: de0d23c12c42317c273919b597f6822af2102e55 diff --git a/trunk/drivers/mfd/asic3.c b/trunk/drivers/mfd/asic3.c index 50c773c4d60a..f2fb233b0ff3 100644 --- a/trunk/drivers/mfd/asic3.c +++ b/trunk/drivers/mfd/asic3.c @@ -137,7 +137,7 @@ static void asic3_irq_demux(unsigned int irq, struct irq_desc *desc) for (i = ASIC3_NUM_GPIOS; i < ASIC3_NR_IRQS; i++) { /* They start at bit 4 and go up */ if (status & (1 << (i - ASIC3_NUM_GPIOS + 4))) { - desc = irq_desc + + i; + desc = irq_desc + asic->irq_base + i; desc->handle_irq(asic->irq_base + i, desc); }