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

Commit b585ce05 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/sde: Fix uninitialized variables and pointers" into dev/msm-4.14-display

parents fc112e78 ff16ce0e

drivers/clk/qcom/mdss/mdss-dsi-pll-10nm.c

+5 −0
Original line number Diff line number Diff line
@@ -925,6 +925,11 @@ static unsigned long vco_10nm_recalc_rate(struct clk_hw *hw, 
	if (!vco->priv)

		pr_err("vco priv is null\n");



	if (!pll) {

		pr_err("pll is null\n");

		return 0;

	}



	/*

	 * Calculate the vco rate from HW registers only for handoff cases.

	 * For other cases where a vco_10nm_set_rate() has already been

drivers/gpu/drm/msm/dp/dp_drm.c

+5 −0
Original line number Diff line number Diff line
@@ -219,6 +219,11 @@ static void dp_bridge_disable(struct drm_bridge *drm_bridge) 


	dp = bridge->display;



	if (!dp) {

		pr_err("dp is null\n");

		return;

	}



	if (dp)

		sde_connector_helper_bridge_disable(bridge->connector);

drivers/gpu/drm/msm/sde/sde_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -2359,7 +2359,7 @@ static int sde_kms_cont_splash_config(struct msm_kms *kms) 
		 * configuration.

		 */

		if (conn_iter &&

			conn_iter->encoder_ids[0] == encoder->base.id) {

			(conn_iter->encoder_ids[0] == encoder->base.id)) {

			connector = conn_iter;

			break;

		}