]> git.hungrycats.org Git - linux/commitdiff
Input: twl4030-pwrbutton - use correct device for irq request
authorSebastian Reichel <sebastian.reichel@collabora.co.uk>
Fri, 28 Apr 2017 17:25:51 +0000 (10:25 -0700)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 26 Aug 2017 01:14:42 +0000 (02:14 +0100)
commit 3071e9dd6cd3f2290d770117330f2c8b2e9a97e4 upstream.

The interrupt should be requested for the platform device
and not for the input device.

Fixes: 7f9ce649d267 ("Input: twl4030-pwrbutton - simplify driver using devm_*")
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/input/misc/twl4030-pwrbutton.c

index 8400a1a34d87569a5d81febffb75e97d91365ee5..d6ee310c63cdcf0858d08be6c44c87e7713a1884 100644 (file)
@@ -70,7 +70,7 @@ static int twl4030_pwrbutton_probe(struct platform_device *pdev)
        pwr->phys = "twl4030_pwrbutton/input0";
        pwr->dev.parent = &pdev->dev;
 
-       err = devm_request_threaded_irq(&pwr->dev, irq, NULL, powerbutton_irq,
+       err = devm_request_threaded_irq(&pdev->dev, irq, NULL, powerbutton_irq,
                        IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
                        "twl4030_pwrbutton", pwr);
        if (err < 0) {