public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 3/4] onkey: 88pm80x: update irq base
@ 2012-12-03  5:42 Qing Xu
  2012-12-12  6:26 ` Qing Xu
  0 siblings, 1 reply; 2+ messages in thread
From: Qing Xu @ 2012-12-03  5:42 UTC (permalink / raw)
  To: dmitry.torokhov, qingx, zhouqiao, sameo, cxie4, linux-kernel

From: Qing Xu <qingx@marvell.com>

irq base is stored in 88pm80x's drv data, we need to add irq
base to get the correct irq num

Signed-off-by: Qiao Zhou <zhouqiao@marvell.com>
Signed-off-by: Qing Xu <qingx@marvell.com>
---
 drivers/input/misc/88pm80x_onkey.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/input/misc/88pm80x_onkey.c b/drivers/input/misc/88pm80x_onkey.c
index 7f26e7b..cc352f9 100644
--- a/drivers/input/misc/88pm80x_onkey.c
+++ b/drivers/input/misc/88pm80x_onkey.c
@@ -67,7 +67,7 @@ static int __devinit pm80x_onkey_probe(struct platform_device *pdev)
 
 	struct pm80x_chip *chip = dev_get_drvdata(pdev->dev.parent);
 	struct pm80x_onkey_info *info;
-	int err;
+	int irq, err;
 
 	info = kzalloc(sizeof(struct pm80x_onkey_info), GFP_KERNEL);
 	if (!info)
@@ -75,13 +75,14 @@ static int __devinit pm80x_onkey_probe(struct platform_device *pdev)
 
 	info->pm80x = chip;
 
-	info->irq = platform_get_irq(pdev, 0);
-	if (info->irq < 0) {
+	irq = platform_get_irq(pdev, 0);
+	if (irq < 0) {
 		dev_err(&pdev->dev, "No IRQ resource!\n");
 		err = -EINVAL;
 		goto out;
 	}
 
+	info->irq = irq + chip->irq_base;
 	info->map = info->pm80x->regmap;
 	if (!info->map) {
 		dev_err(&pdev->dev, "no regmap!\n");
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-12-12  6:27 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-03  5:42 [PATCH 3/4] onkey: 88pm80x: update irq base Qing Xu
2012-12-12  6:26 ` Qing Xu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox