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

Commit 43f5bad4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/dsi-staging: make core supplies optional" into msm-4.9

parents e3374a6d 9a5a7b9d

drivers/gpu/drm/msm/dsi-staging/dsi_ctrl.c

+4 −6
Original line number Diff line number Diff line
@@ -613,10 +613,8 @@ static int dsi_ctrl_supplies_init(struct platform_device *pdev, 
	rc = dsi_pwr_get_dt_vreg_data(&pdev->dev,

					  &ctrl->pwr_info.digital,

					  "qcom,core-supply-entries");

	if (rc) {

		pr_err("failed to get digital supply, rc = %d\n", rc);

		goto error;

	}

	if (rc)

		pr_debug("failed to get digital supply, rc = %d\n", rc);



	rc = dsi_pwr_get_dt_vreg_data(&pdev->dev,

					  &ctrl->pwr_info.host_pwr,
@@ -663,10 +661,10 @@ static int dsi_ctrl_supplies_init(struct platform_device *pdev, 
	ctrl->pwr_info.host_pwr.vregs = NULL;

	ctrl->pwr_info.host_pwr.count = 0;

error_digital:

	if (ctrl->pwr_info.digital.vregs)

		devm_kfree(&pdev->dev, ctrl->pwr_info.digital.vregs);

	ctrl->pwr_info.digital.vregs = NULL;

	ctrl->pwr_info.digital.count = 0;

error:

	return rc;

}