diff options
author | Thierry Reding <thierry.reding@gmail.com> | 2016-05-17 14:57:58 +0200 |
---|---|---|
committer | Thierry Reding <thierry.reding@gmail.com> | 2016-05-17 14:57:58 +0200 |
commit | 18c588786c08458f5d965d8735ab48f9e51e0b4b (patch) | |
tree | 925893d58c00432f93830d1b83405c9d44d79bb8 /drivers/input/misc/max8997_haptic.c | |
parent | Merge branch 'for-4.7/pwm-regulator' into for-next (diff) | |
parent | pwm: Add information about polarity, duty cycle and period to debugfs (diff) | |
download | linux-18c588786c08458f5d965d8735ab48f9e51e0b4b.tar.xz linux-18c588786c08458f5d965d8735ab48f9e51e0b4b.zip |
Merge branch 'for-4.7/pwm-atomic' into for-next
Diffstat (limited to 'drivers/input/misc/max8997_haptic.c')
-rw-r--r-- | drivers/input/misc/max8997_haptic.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/input/misc/max8997_haptic.c b/drivers/input/misc/max8997_haptic.c index a806ba3818f7..bf17f654ed88 100644 --- a/drivers/input/misc/max8997_haptic.c +++ b/drivers/input/misc/max8997_haptic.c @@ -304,6 +304,12 @@ static int max8997_haptic_probe(struct platform_device *pdev) error); goto err_free_mem; } + + /* + * FIXME: pwm_apply_args() should be removed when switching to + * the atomic PWM API. + */ + pwm_apply_args(chip->pwm); break; default: |