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

Commit 863af8f7 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: fix overflow when reading pixel clock"

parents 97965170 d3d63a70

drivers/video/msm/mdss/mdss_dsi_panel.c

+3 −1
Original line number Diff line number Diff line
@@ -2015,9 +2015,11 @@ static int mdss_dsi_panel_timing_from_dt(struct device_node *np, 
	rc = of_property_read_u32(np, "qcom,mdss-dsi-panel-framerate", &tmp);

	pt->timing.frame_rate = !rc ? tmp : DEFAULT_FRAME_RATE;

	rc = of_property_read_u64(np, "qcom,mdss-dsi-panel-clockrate", &tmp64);

	if (rc == -EOVERFLOW)

	if (rc == -EOVERFLOW) {

		tmp64 = 0;

		rc = of_property_read_u32(np,

			"qcom,mdss-dsi-panel-clockrate", (u32 *)&tmp64);

	}

	pt->timing.clk_rate = !rc ? tmp64 : 0;



	data = of_get_property(np, "qcom,mdss-dsi-panel-timings", &len);