mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-11-27 03:55:37 +08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
This commit is contained in:
commit
3818da6b5c
@ -2274,6 +2274,17 @@ struct regulator *_regulator_get(struct device *dev, const char *id,
|
||||
if (ret > 0) {
|
||||
rdev->use_count = 1;
|
||||
regulator->enable_count = 1;
|
||||
|
||||
/* Propagate the regulator state to its supply */
|
||||
if (rdev->supply) {
|
||||
ret = regulator_enable(rdev->supply);
|
||||
if (ret < 0) {
|
||||
destroy_regulator(regulator);
|
||||
module_put(rdev->owner);
|
||||
put_device(&rdev->dev);
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
rdev->use_count = 0;
|
||||
regulator->enable_count = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user