diff --git a/[refs] b/[refs] index cec7c550188d..30df24e2fef6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 201cf052810d20814a77ca0e0045a2c1a3508a1f +refs/heads/master: 12693f6c1ff6f43f34a0d105307976337f64dcdd diff --git a/trunk/drivers/mfd/asic3.c b/trunk/drivers/mfd/asic3.c index 9d4a492e4295..383421bf5760 100644 --- a/trunk/drivers/mfd/asic3.c +++ b/trunk/drivers/mfd/asic3.c @@ -545,7 +545,7 @@ static int asic3_gpio_to_irq(struct gpio_chip *chip, unsigned offset) { struct asic3 *asic = container_of(chip, struct asic3, gpio); - return (offset < ASIC3_NUM_GPIOS) ? asic->irq_base + offset : -ENXIO; + return asic->irq_base + offset; } static __init int asic3_gpio_probe(struct platform_device *pdev,