lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1354513326-21026-1-git-send-email-qingx@marvell.com>
Date:	Mon,  3 Dec 2012 13:42:06 +0800
From:	Qing Xu <qingx@...vell.com>
To:	dmitry.torokhov@...il.com, qingx@...vell.com, zhouqiao@...vell.com,
	sameo@...ux.intel.com, cxie4@...vell.com,
	linux-kernel@...r.kernel.org
Subject: [PATCH 3/4] onkey: 88pm80x: update irq base

From: Qing Xu <qingx@...vell.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@...vell.com>
Signed-off-by: Qing Xu <qingx@...vell.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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ