diff options
author | Boris Brezillon <boris.brezillon@free-electrons.com> | 2016-04-14 15:17:34 -0400 |
---|---|---|
committer | Thierry Reding <thierry.reding@gmail.com> | 2016-05-17 08:45:06 -0400 |
commit | cfae56f18c7cbdb0542025b0d3f000d9ba0152d0 (patch) | |
tree | 8fc5eb42dae695c19e5758b2351dddf997273df5 /drivers/input/misc/pwm-beeper.c | |
parent | de93170b85d7ee2a6a6a881c019160a65adeb636 (diff) |
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/misc/pwm-beeper.c')
-rw-r--r-- | drivers/input/misc/pwm-beeper.c | 6 |
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) | |||
87 | goto err_free; | 87 | goto err_free; |
88 | } | 88 | } |
89 | 89 | ||
90 | /* | ||
91 | * FIXME: pwm_apply_args() should be removed when switching to | ||
92 | * the atomic PWM API. | ||
93 | */ | ||
94 | pwm_apply_args(beeper->pwm); | ||
95 | |||
90 | beeper->input = input_allocate_device(); | 96 | beeper->input = input_allocate_device(); |
91 | if (!beeper->input) { | 97 | if (!beeper->input) { |
92 | dev_err(&pdev->dev, "Failed to allocate input device\n"); | 98 | dev_err(&pdev->dev, "Failed to allocate input device\n"); |