summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorBoris Brezillon <boris.brezillon@free-electrons.com>2016-04-14 21:17:34 +0200
committerThierry Reding <thierry.reding@gmail.com>2016-05-17 14:45:06 +0200
commitcfae56f18c7cbdb0542025b0d3f000d9ba0152d0 (patch)
tree8fc5eb42dae695c19e5758b2351dddf997273df5 /drivers/input
parentinput: misc: max8997: Explicitly apply PWM config extracted from pwm_args (diff)
downloadlinux-cfae56f18c7cbdb0542025b0d3f000d9ba0152d0.tar.xz
linux-cfae56f18c7cbdb0542025b0d3f000d9ba0152d0.zip
input: misc: pwm-beeper: Explicitly apply PWM config extracted from pwm_args
Call pwm_apply_args() just after requesting the PWM device so that the polarity and period are initialized according to the information provided in pwm_args. This is an intermediate state, and pwm_apply_args() should be dropped as soon as the atomic PWM infrastructure is in place and the driver makes use of it. Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/misc/pwm-beeper.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/input/misc/pwm-beeper.c b/drivers/input/misc/pwm-beeper.c
index f2261ab54701..8d7133268745 100644
--- a/drivers/input/misc/pwm-beeper.c
+++ b/drivers/input/misc/pwm-beeper.c
@@ -87,6 +87,12 @@ static int pwm_beeper_probe(struct platform_device *pdev)
goto err_free;
}
+ /*
+ * FIXME: pwm_apply_args() should be removed when switching to
+ * the atomic PWM API.
+ */
+ pwm_apply_args(beeper->pwm);
+
beeper->input = input_allocate_device();
if (!beeper->input) {
dev_err(&pdev->dev, "Failed to allocate input device\n");