Skip to content

Commit

Permalink
mfd: max8925: Fix onkey driver irq base
Browse files Browse the repository at this point in the history
update onkey driver's irq base, it should get from max8925,
but not save in a private value

Signed-off-by: Qing Xu <qingx@marvell.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
  • Loading branch information
Qing Xu authored and Samuel Ortiz committed Feb 13, 2013
1 parent f9ed143 commit 678e8cb
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
3 changes: 0 additions & 3 deletions drivers/input/misc/max8925_onkey.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/mfd/max8925-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 678e8cb

Please sign in to comment.