---

yaml --- r: 357615 b: refs/heads/master c: 678e8cb h: refs/heads/master i: 357613: 250f4ed 357611: a9739a0 357607: 6d8fb2d 357599: 155f087 v: v3
git-mirror · Feb 13, 2013 · 7ccc139 · 7ccc139
1 parent 15759c3
commit 7ccc139
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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;