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

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

Merge "msm: mdss: Unregister the regulator notifier when mdss_mdp probe fails"

parents a288b1c8 fde8b3ca

drivers/video/msm/mdss/mdss.h

+1 −0
Original line number Diff line number Diff line
@@ -252,6 +252,7 @@ struct mdss_data_type { 
	u32 latency_buff_per;

	atomic_t active_intf_cnt;

	bool has_rot_dwnscale;

	bool regulator_notif_register;



	u64 ab[MDSS_MAX_BUS_CLIENTS];

	u64 ib[MDSS_MAX_BUS_CLIENTS];

drivers/video/msm/mdss/mdss_mdp.c

+7 −0
Original line number Diff line number Diff line
@@ -912,6 +912,8 @@ static int mdss_mdp_irq_clk_setup(struct mdss_data_type *mdata) 
	mdata->gdsc_cb.priority = 5;

	if (regulator_register_notifier(mdata->fs, &(mdata->gdsc_cb)))

		pr_warn("GDSC notification registration failed!\n");

	else

		mdata->regulator_notif_register = true;



	mdata->vdd_cx = devm_regulator_get(&mdata->pdev->dev,

				"vdd-cx");
@@ -1573,6 +1575,9 @@ static int mdss_mdp_probe(struct platform_device *pdev) 
	mdss_res->mdss_util->mdp_probe_done = true;

probe_done:

	if (IS_ERR_VALUE(rc)) {

		if (mdata->regulator_notif_register)

			regulator_unregister_notifier(mdata->fs,

						&(mdata->gdsc_cb));

		mdss_mdp_hw.ptr = NULL;

		mdss_mdp_pp_term(&pdev->dev);

		mutex_destroy(&mdata->reg_lock);
@@ -3188,6 +3193,8 @@ static int mdss_mdp_remove(struct platform_device *pdev) 
	mdss_mdp_pp_term(&pdev->dev);

	mdss_mdp_bus_scale_unregister(mdata);

	mdss_debugfs_remove(mdata);

	if (mdata->regulator_notif_register)

		regulator_unregister_notifier(mdata->fs, &(mdata->gdsc_cb));

	return 0;

}