---

yaml --- r: 299458 b: refs/heads/master c: 02269ab h: refs/heads/master v: v3
git-mirror · Apr 16, 2012 · 7da04be · 7da04be
1 parent 6daf7a5
commit 7da04be
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1fcb57d0f6e1150003d222051aaaf4bc4a9ccc94
+refs/heads/master: 02269ab10f1130d35dc35db72ab026d16ba31abf
diff --git a/trunk/drivers/mfd/asic3.c b/trunk/drivers/mfd/asic3.c
@@ -527,7 +527,9 @@ static void asic3_gpio_set(struct gpio_chip *chip,
 
 static int asic3_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
 {
-	return (offset < ASIC3_NUM_GPIOS) ? IRQ_BOARD_START + offset : -ENXIO;
+	struct asic3 *asic = container_of(chip, struct asic3, gpio);
+
+	return (offset < ASIC3_NUM_GPIOS) ? asic->irq_base + offset : -ENXIO;
 }
 
 static __init int asic3_gpio_probe(struct platform_device *pdev,