diff options
| -rw-r--r-- | drivers/input/misc/max8925_onkey.c | 3 | ||||
| -rw-r--r-- | drivers/mfd/max8925-core.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/input/misc/max8925_onkey.c b/drivers/input/misc/max8925_onkey.c index 369a39de4ff3..f9179b2585a9 100644 --- a/drivers/input/misc/max8925_onkey.c +++ b/drivers/input/misc/max8925_onkey.c | |||
| @@ -100,9 +100,6 @@ static int max8925_onkey_probe(struct platform_device *pdev) | |||
| 100 | input->dev.parent = &pdev->dev; | 100 | input->dev.parent = &pdev->dev; |
| 101 | input_set_capability(input, EV_KEY, KEY_POWER); | 101 | input_set_capability(input, EV_KEY, KEY_POWER); |
| 102 | 102 | ||
| 103 | irq[0] += chip->irq_base; | ||
| 104 | irq[1] += chip->irq_base; | ||
| 105 | |||
| 106 | error = request_threaded_irq(irq[0], NULL, max8925_onkey_handler, | 103 | error = request_threaded_irq(irq[0], NULL, max8925_onkey_handler, |
| 107 | IRQF_ONESHOT, "onkey-down", info); | 104 | IRQF_ONESHOT, "onkey-down", info); |
| 108 | if (error < 0) { | 105 | if (error < 0) { |
diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c index d7abbb354acd..f0cc40296d8c 100644 --- a/drivers/mfd/max8925-core.c +++ b/drivers/mfd/max8925-core.c | |||
| @@ -867,7 +867,7 @@ int max8925_device_init(struct max8925_chip *chip, | |||
| 867 | 867 | ||
| 868 | ret = mfd_add_devices(chip->dev, 0, &onkey_devs[0], | 868 | ret = mfd_add_devices(chip->dev, 0, &onkey_devs[0], |
| 869 | ARRAY_SIZE(onkey_devs), | 869 | ARRAY_SIZE(onkey_devs), |
| 870 | NULL, 0, NULL); | 870 | NULL, chip->irq_base, NULL); |
| 871 | if (ret < 0) { | 871 | if (ret < 0) { |
| 872 | dev_err(chip->dev, "Failed to add onkey subdev\n"); | 872 | dev_err(chip->dev, "Failed to add onkey subdev\n"); |
| 873 | goto out_dev; | 873 | goto out_dev; |
