diff options
| author | Emmanuel Vadot <manu@FreeBSD.org> | 2021-05-16 14:21:43 +0000 |
|---|---|---|
| committer | Emmanuel Vadot <manu@FreeBSD.org> | 2021-05-21 15:39:07 +0000 |
| commit | f52072b06da761c05dcb636dd1a02dea7214174a (patch) | |
| tree | ce46d93db8b75b3d6ce83fb756d3e911964c0651 | |
| parent | ce41765c21ac56a37c60a0e8cd227ee3396740cc (diff) | |
extres: regulator: Fix regulator_status for already enable regulators
If a regulator hasn't been enable by a driver but is enabled in hardware
(most likely enabled by U-Boot), regulator_status will returns that it
is enabled and so any call to regulator_disable will panic as it wasn't
enabled by one of our drivers.
Sponsored by: Diablotin Systems
Differential Revision: https://reviews.freebsd.org/D30293
| -rw-r--r-- | sys/dev/extres/regulator/regulator.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/dev/extres/regulator/regulator.c b/sys/dev/extres/regulator/regulator.c index 63b7d116f416..eab79e9dfbc3 100644 --- a/sys/dev/extres/regulator/regulator.c +++ b/sys/dev/extres/regulator/regulator.c @@ -985,6 +985,10 @@ regulator_status(regulator_t reg, int *status) KASSERT(regnode->ref_cnt > 0, ("Attempt to access unreferenced regulator: %s\n", regnode->name)); + if (reg->enable_cnt == 0) { + *status = 0; + return (0); + } REG_TOPO_SLOCK(); rv = regnode_status(regnode, status); REG_TOPO_UNLOCK(); |