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

Commit a7354462 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: use correct of node" into dev/msm-4.14-display

parents 7ec3a597 5f72dcad
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -4235,7 +4235,7 @@ static void dsi_display_setup(struct dsi_display *display)

	}

	display->display_type = of_get_property(pdev->dev.of_node,
	display->display_type = of_get_property(display->disp_node,
					"qcom,display-type", NULL);
	if (!display->display_type)
		display->display_type = "unknown";