diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2024-07-15 23:03:44 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2024-07-15 23:03:44 +0200 |
| commit | a23e1966932464e1c5226cb9ac4ce1d5fc10ba22 (patch) | |
| tree | bf5f1b57faa01ca31656bfc48c7d6b6f0bc39189 /drivers/input/misc/da7280.c | |
| parent | Input: ads7846 - use spi_device_id table (diff) | |
| parent | Input: yealink - simplify locking in sysfs attribute handling (diff) | |
| download | linux-a23e1966932464e1c5226cb9ac4ce1d5fc10ba22.tar.xz linux-a23e1966932464e1c5226cb9ac4ce1d5fc10ba22.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 6.11 merge window.
Diffstat (limited to 'drivers/input/misc/da7280.c')
| -rw-r--r-- | drivers/input/misc/da7280.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/misc/da7280.c b/drivers/input/misc/da7280.c index d82e08cf761b..1629b7ea4cbd 100644 --- a/drivers/input/misc/da7280.c +++ b/drivers/input/misc/da7280.c @@ -351,7 +351,7 @@ static int da7280_haptic_set_pwm(struct da7280_haptic *haptics, bool enabled) state.duty_cycle = period_mag_multi; } - error = pwm_apply_state(haptics->pwm_dev, &state); + error = pwm_apply_might_sleep(haptics->pwm_dev, &state); if (error) dev_err(haptics->dev, "Failed to apply pwm state: %d\n", error); @@ -1174,7 +1174,7 @@ static int da7280_probe(struct i2c_client *client) /* Sync up PWM state and ensure it is off. */ pwm_init_state(haptics->pwm_dev, &state); state.enabled = false; - error = pwm_apply_state(haptics->pwm_dev, &state); + error = pwm_apply_might_sleep(haptics->pwm_dev, &state); if (error) { dev_err(dev, "Failed to apply PWM state: %d\n", error); return error; |