diff options
| author | Mark Brown <broonie@kernel.org> | 2021-04-23 19:01:21 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-04-23 19:01:21 +0100 |
| commit | 0bbefa641a324b5416a88189069ff5a30975970c (patch) | |
| tree | 113069d2a3757e16a3773e1647426e1e227908d5 /drivers/regulator/core.c | |
| parent | bf05bf16c76bb44ab5156223e1e58e26dfe30a88 (diff) | |
| parent | a5ccccb3ec0b052804d03df90c0d08689be54170 (diff) | |
Merge remote-tracking branch 'regulator/for-5.12' into regulator-linus
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 16114aea099a..d6219cb8bd29 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1439,6 +1439,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); |