[4.4,13/43] regulator: core: Clear the supply pointer if enabling fails
diff mbox series

Message ID 20170501212600.068430884@linuxfoundation.org
State New, archived
Headers show
  • 4.4.66-stable review
Related show

Commit Message

Greg KH May 1, 2017, 9:27 p.m. UTC
4.4-stable review patch.  If anyone has any objections, please let me know.


From: Jon Hunter <jonathanh@nvidia.com>

commit 8e5356a73604f53da6a1e0756727cb8f9f7bba17 upstream.

During the resolution of a regulator's supply, we may attempt to enable
the supply if the regulator itself is already enabled. If enabling the
supply fails, then we will call _regulator_put() for the supply.
However, the pointer to the supply has not been cleared for the
regulator and this will cause a crash if we then unregister the
regulator and attempt to call regulator_put() a second time for the
supply. Fix this by clearing the supply pointer if enabling the supply
after fails when resolving the supply for a regulator.

Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

 drivers/regulator/core.c |    1 +
 1 file changed, 1 insertion(+)

diff mbox series

--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1519,6 +1519,7 @@  static int regulator_resolve_supply(stru
 		ret = regulator_enable(rdev->supply);
 		if (ret < 0) {
+			rdev->supply = NULL;
 			return ret;