From 40851724476bb038fd1dd76343698527390f3884 Mon Sep 17 00:00:00 2001 From: Paul Parsons Date: Tue, 31 Jan 2012 01:18:35 +0000 Subject: [PATCH] --- yaml --- r: 296826 b: refs/heads/master c: 450b1151065ae967583fe69c82c50140560a5681 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mfd/asic3.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ea8c4d0ccce6..91e830a70e40 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: edcf3196e9e646acc88d53e3bf355a6975daf109 +refs/heads/master: 450b1151065ae967583fe69c82c50140560a5681 diff --git a/trunk/drivers/mfd/asic3.c b/trunk/drivers/mfd/asic3.c index b85bbd7f0d19..1895cf9fab8c 100644 --- a/trunk/drivers/mfd/asic3.c +++ b/trunk/drivers/mfd/asic3.c @@ -525,6 +525,11 @@ static void asic3_gpio_set(struct gpio_chip *chip, return; } +static int asic3_gpio_to_irq(struct gpio_chip *chip, unsigned offset) +{ + return (offset < ASIC3_NUM_GPIOS) ? IRQ_BOARD_START + offset : -ENXIO; +} + static __init int asic3_gpio_probe(struct platform_device *pdev, u16 *gpio_config, int num) { @@ -976,6 +981,7 @@ static int __init asic3_probe(struct platform_device *pdev) asic->gpio.set = asic3_gpio_set; asic->gpio.direction_input = asic3_gpio_direction_input; asic->gpio.direction_output = asic3_gpio_direction_output; + asic->gpio.to_irq = asic3_gpio_to_irq; ret = asic3_gpio_probe(pdev, pdata->gpio_config,