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

Commit 79f6236b 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: Remove additional clk refcnts in dual-dsi"

parents 0ea2d121 8bcd6eac

drivers/video/msm/mdss/mdss_fb.c

+4 −1
Original line number Diff line number Diff line
@@ -2223,6 +2223,7 @@ int mdss_register_panel(struct platform_device *pdev, 
	struct platform_device *fb_pdev, *mdss_pdev;

	struct device_node *node;

	int rc = 0;

	bool master_panel = true;



	if (!pdev || !pdev->dev.of_node) {

		pr_err("Invalid device node\n");
@@ -2250,6 +2251,8 @@ int mdss_register_panel(struct platform_device *pdev, 
	fb_pdev = of_find_device_by_node(node);

	if (fb_pdev) {

		rc = mdss_fb_register_extra_panel(fb_pdev, pdata);

		if (rc == 0)

			master_panel = false;

	} else {

		pr_info("adding framebuffer device %s\n", dev_name(&pdev->dev));

		fb_pdev = of_platform_device_create(node, NULL,
@@ -2257,7 +2260,7 @@ int mdss_register_panel(struct platform_device *pdev, 
		fb_pdev->dev.platform_data = pdata;

	}



	if (mdp_instance->panel_register_done)

	if (master_panel && mdp_instance->panel_register_done)

		mdp_instance->panel_register_done(pdata);



mdss_notfound: