joy/android_kernel_sony_sdm845
Watch
1
Fork
You've already forked android_kernel_sony_sdm845
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "regulator: core: fix debugfs file creation"

Browse source
This commit is contained in:
Linux Build Service Account 2017-12-08 14:39:00 -08:00 • committed by Gerrit - the friendly Code Review server
commit 7bdcdc4dcb
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/regulator/core.c
View file

@ -4184,6 +4184,7 @@ static void rdev_deinit_debugfs(struct regulator_dev *rdev)
debugfs_remove_recursive(rdev->debugfs);
if (rdev->debug_consumer)
rdev->debug_consumer->debugfs = NULL;
rdev->debugfs = NULL;
regulator_put(rdev->debug_consumer);
}
}
@ -4225,9 +4226,10 @@ static void rdev_init_debugfs(struct regulator_dev *rdev)
regulator = regulator_get(NULL, rdev_get_name(rdev));
if (IS_ERR(regulator)) {
debugfs_remove_recursive(rdev->debugfs);
rdev_err(rdev, "regulator get failed, ret=%ld\n",
PTR_ERR(regulator));
rdev_deinit_debugfs(rdev);
if (PTR_ERR(regulator) != -EPROBE_DEFER)
rdev_err(rdev, "regulator get failed, ret=%ld\n",
PTR_ERR(regulator));
return;
}
rdev->debug_consumer = regulator;