aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Thomson <Adam.Thomson.Opensource@diasemi.com>2014-04-03 17:50:18 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-03 19:21:24 -0400
commitdc9d8887408ac3dfd907b826c5dfdfe953c21a0f (patch)
treea87d1adfc7eb55520adaaf54921657146acaf8b9
parent67ab2440b40610b3b91068844640df6d3de3464f (diff)
drivers/rtc/rtc-da9055.c: 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> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/rtc/rtc-da9055.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-da9055.c b/drivers/rtc/rtc-da9055.c
index 48cb2ac3bd3e..a825491331c8 100644
--- a/drivers/rtc/rtc-da9055.c
+++ b/drivers/rtc/rtc-da9055.c
@@ -302,7 +302,9 @@ static int da9055_rtc_probe(struct platform_device *pdev)
302 } 302 }
303 303
304 alm_irq = platform_get_irq_byname(pdev, "ALM"); 304 alm_irq = platform_get_irq_byname(pdev, "ALM");
305 alm_irq = regmap_irq_get_virq(rtc->da9055->irq_data, alm_irq); 305 if (alm_irq < 0)
306 return alm_irq;
307
306 ret = devm_request_threaded_irq(&pdev->dev, alm_irq, NULL, 308 ret = devm_request_threaded_irq(&pdev->dev, alm_irq, NULL,
307 da9055_rtc_alm_irq, 309 da9055_rtc_alm_irq,
308 IRQF_TRIGGER_HIGH | IRQF_ONESHOT, 310 IRQF_TRIGGER_HIGH | IRQF_ONESHOT,