Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e4aef37 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "regulator: rpm-smd: Correct proxy regulator registration"

parents b4566e9b 30b4881d

drivers/regulator/rpm-smd-regulator.c

+2 −2
Original line number Diff line number Diff line
@@ -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(&reg->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);