aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorAdam Thomson <Adam.Thomson.Opensource@diasemi.com>2014-04-08 13:55:17 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-04-19 13:55:41 -0700
commit06491e84f0f95dbe105b74fef32e7063e349f2d7 (patch)
tree41a37d601728f3719fb10c75bd3dcba40df1bec0 /drivers/input
parentMerge branch 'next' into for-linus (diff)
downloadlinux-dev-06491e84f0f95dbe105b74fef32e7063e349f2d7.tar.xz
linux-dev-06491e84f0f95dbe105b74fef32e7063e349f2d7.zip
Input: da9055_onkey - remove use of regmap_irq_get_virq()
Using platform_get_irq_byname() to retrieve the IRQ number returns the VIRQ number rather than the local IRQ number for the device. Passing that value then into regmap_irq_get_virq() causes a failure because the function is expecting the local IRQ number (e.g. 0, 1, 2, 3, etc). This patch removes use of regmap_irq_get_virq() to prevent this failure from happening. Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/misc/da9055_onkey.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/misc/da9055_onkey.c b/drivers/input/misc/da9055_onkey.c
index 4b11ede34950..4765799fef74 100644
--- a/drivers/input/misc/da9055_onkey.c
+++ b/drivers/input/misc/da9055_onkey.c
@@ -109,7 +109,6 @@ static int da9055_onkey_probe(struct platform_device *pdev)
INIT_DELAYED_WORK(&onkey->work, da9055_onkey_work);
- irq = regmap_irq_get_virq(da9055->irq_data, irq);
err = request_threaded_irq(irq, NULL, da9055_onkey_irq,
IRQF_TRIGGER_HIGH | IRQF_ONESHOT,
"ONKEY", onkey);