diff options
author | Alex Shi <alex.shi@linaro.org> | 2018-03-26 02:31:53 +0000 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2018-03-26 02:31:53 +0000 |
commit | c5833b96030f9e06cf7c19dd4f99d3b55985eb8c (patch) | |
tree | 9587bb407acebb17bbd8a33d2d9c53ecbe1ab442 /drivers/input/misc/twl4030-pwrbutton.c | |
parent | 78c39820dc30c73f5b69c3fe2269ad9b0840a61a (diff) | |
parent | b766b14a48de577e5060e4d8762f1e4a34229d2b (diff) |
Merge tag 'v4.4.124' into linux-linaro-lsk-v4.4lsk-v4.4-18.03
This is the 4.4.124 stable release
Diffstat (limited to 'drivers/input/misc/twl4030-pwrbutton.c')
-rw-r--r-- | drivers/input/misc/twl4030-pwrbutton.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/twl4030-pwrbutton.c b/drivers/input/misc/twl4030-pwrbutton.c index 603fc2fadf05..12b20840fb74 100644 --- a/drivers/input/misc/twl4030-pwrbutton.c +++ b/drivers/input/misc/twl4030-pwrbutton.c @@ -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 | IRQF_ONESHOT, "twl4030_pwrbutton", pwr); |