From 7da04be4108f7fe20bbf0cc4a3086270ee4a1f1c Mon Sep 17 00:00:00 2001 From: Dmitry Artamonow Date: Thu, 12 Apr 2012 15:33:34 +0400 Subject: [PATCH] --- yaml --- r: 299458 b: refs/heads/master c: 02269ab10f1130d35dc35db72ab026d16ba31abf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mfd/asic3.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b448d15ee2df..91fea08e23dd 100644 --- 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 index 1895cf9fab8c..1582c3d95257 100644 --- 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,