mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-09 21:59:12 -04:00
Merge "regulator: rpm-smd: Correct proxy regulator registration"
This commit is contained in:
commit
1e4aef37ea
1 changed files with 2 additions and 2 deletions
|
|
@ -1316,7 +1316,7 @@ static int rpm_vreg_device_remove(struct platform_device *pdev)
|
|||
rpm_vreg = reg->rpm_vreg;
|
||||
rpm_vreg_lock(rpm_vreg);
|
||||
regulator_unregister(reg->rdev);
|
||||
devm_regulator_proxy_consumer_unregister(dev);
|
||||
devm_regulator_proxy_consumer_unregister(pdev->dev.parent);
|
||||
list_del(®->list);
|
||||
kfree(reg);
|
||||
rpm_vreg_unlock(rpm_vreg);
|
||||
|
|
@ -1646,7 +1646,7 @@ static int rpm_vreg_device_probe(struct platform_device *pdev)
|
|||
goto fail_remove_from_list;
|
||||
}
|
||||
|
||||
rc = devm_regulator_proxy_consumer_register(dev, node);
|
||||
rc = devm_regulator_proxy_consumer_register(pdev->dev.parent, node);
|
||||
if (rc)
|
||||
vreg_err(reg, "failed to register proxy consumer, rc=%d\n",
|
||||
rc);
|
||||
|
|
|
|||
Loading…
Reference in a new issue