diff options
| author | Mark Brown <broonie@kernel.org> | 2021-04-23 13:17:36 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-04-23 13:17:36 +0100 |
| commit | 41a36ffc182ad7d0da1121d67eb2fd8f9ee28ec8 (patch) | |
| tree | d6a7edefc4698575cca0d80817fb62033b21d76c /drivers/regulator/core.c | |
| parent | 823543b739c89cd232a6c6815362f32ed81a679e (diff) | |
| parent | a5ccccb3ec0b052804d03df90c0d08689be54170 (diff) | |
Merge branch 'for-5.12' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-5.13
Diffstat (limited to 'drivers/regulator/core.c')
| -rw-r--r-- | drivers/regulator/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index d31f5c3cd773..504898ba265e 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1442,6 +1442,8 @@ static int set_machine_constraints(struct regulator_dev *rdev) if (rdev->constraints->always_on) rdev->use_count++; + } else if (rdev->desc->off_on_delay) { + rdev->last_off_jiffy = jiffies; } print_constraints(rdev); |