From 7ccc139e6268c71db5e48dd318285002d058dcf4 Mon Sep 17 00:00:00 2001 From: Qing Xu Date: Mon, 4 Feb 2013 23:40:44 +0800 Subject: [PATCH] --- yaml --- r: 357615 b: refs/heads/master c: 678e8cb50647a7580b8122937e8e6e50d949267d h: refs/heads/master i: 357613: 250f4ed58dd3f4b918713f17f16e189f07b2282e 357611: a9739a0363b85f190fe5a0b143a4f16e69bbe58c 357607: 6d8fb2d2b4aab8c6b85f031fb2d5cf783869d5c7 357599: 155f087b25c2301266aacd336c387b0abab05ff8 v: v3 --- [refs] | 2 +- trunk/drivers/input/misc/max8925_onkey.c | 3 --- trunk/drivers/mfd/max8925-core.c | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f87087576bdc..151c87d1d5ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9ed143180ffe94a617671aa4ed4106ae183407c +refs/heads/master: 678e8cb50647a7580b8122937e8e6e50d949267d diff --git a/trunk/drivers/input/misc/max8925_onkey.c b/trunk/drivers/input/misc/max8925_onkey.c index 369a39de4ff3..f9179b2585a9 100644 --- a/trunk/drivers/input/misc/max8925_onkey.c +++ b/trunk/drivers/input/misc/max8925_onkey.c @@ -100,9 +100,6 @@ static int max8925_onkey_probe(struct platform_device *pdev) input->dev.parent = &pdev->dev; input_set_capability(input, EV_KEY, KEY_POWER); - irq[0] += chip->irq_base; - irq[1] += chip->irq_base; - error = request_threaded_irq(irq[0], NULL, max8925_onkey_handler, IRQF_ONESHOT, "onkey-down", info); if (error < 0) { diff --git a/trunk/drivers/mfd/max8925-core.c b/trunk/drivers/mfd/max8925-core.c index d7abbb354acd..f0cc40296d8c 100644 --- a/trunk/drivers/mfd/max8925-core.c +++ b/trunk/drivers/mfd/max8925-core.c @@ -867,7 +867,7 @@ int max8925_device_init(struct max8925_chip *chip, ret = mfd_add_devices(chip->dev, 0, &onkey_devs[0], ARRAY_SIZE(onkey_devs), - NULL, 0, NULL); + NULL, chip->irq_base, NULL); if (ret < 0) { dev_err(chip->dev, "Failed to add onkey subdev\n"); goto out_dev;