Commit 18055cbc authored by Jon Hunter's avatar Jon Hunter Committed by Greg Kroah-Hartman

regulator: Fix deadlock during regulator registration

commit a2151374 upstream.

Commit 5e3ca2b3 ("regulator: Try to resolve regulators supplies on
registration") added a call to regulator_resolve_supply() within
regulator_register() where the regulator_list_mutex is held. This causes
a deadlock to occur on the Tegra114 Dalmore board when the palmas PMIC
is registered because regulator_register_resolve_supply() calls
regulator_dev_lookup() which may try to acquire the regulator_list_mutex
again.

Fix this by releasing the mutex before calling
regulator_register_resolve_supply() and update the error exit path to
ensure the mutex is released on an error.

[Made commit message more legible -- broonie]
Signed-off-by: default avatarJon Hunter <jonathanh@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 55d37507
...@@ -3991,12 +3991,11 @@ regulator_register(const struct regulator_desc *regulator_desc, ...@@ -3991,12 +3991,11 @@ regulator_register(const struct regulator_desc *regulator_desc,
} }
rdev_init_debugfs(rdev); rdev_init_debugfs(rdev);
mutex_unlock(&regulator_list_mutex);
/* try to resolve regulators supply since a new one was registered */ /* try to resolve regulators supply since a new one was registered */
class_for_each_device(&regulator_class, NULL, NULL, class_for_each_device(&regulator_class, NULL, NULL,
regulator_register_resolve_supply); regulator_register_resolve_supply);
out:
mutex_unlock(&regulator_list_mutex);
kfree(config); kfree(config);
return rdev; return rdev;
...@@ -4007,15 +4006,16 @@ regulator_register(const struct regulator_desc *regulator_desc, ...@@ -4007,15 +4006,16 @@ regulator_register(const struct regulator_desc *regulator_desc,
regulator_ena_gpio_free(rdev); regulator_ena_gpio_free(rdev);
device_unregister(&rdev->dev); device_unregister(&rdev->dev);
/* device core frees rdev */ /* device core frees rdev */
rdev = ERR_PTR(ret);
goto out; goto out;
wash: wash:
regulator_ena_gpio_free(rdev); regulator_ena_gpio_free(rdev);
clean: clean:
kfree(rdev); kfree(rdev);
rdev = ERR_PTR(ret); out:
goto out; mutex_unlock(&regulator_list_mutex);
kfree(config);
return ERR_PTR(ret);
} }
EXPORT_SYMBOL_GPL(regulator_register); EXPORT_SYMBOL_GPL(regulator_register);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment