Merge "msm: mdss: Fix potential NULL pointer dereference in misr set" (e5678d02) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/video/msm/mdss/mdss_debug.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -1244,11 +1244,14 @@ static inline struct mdss_mdp_misr_map *mdss_misr_get_map(u32 block_id,
		if (ctl) {
		mixer = mdss_mdp_mixer_get(ctl,
		MDSS_MDP_MIXER_MUX_DEFAULT);

		if (mixer) {
		ctrl_reg = mixer->base +
		MDSS_MDP_LAYER_MIXER_MISR_CTRL;
		value_reg = mixer->base +
		MDSS_MDP_LAYER_MIXER_MISR_SIGNATURE;
		}
		}
		} else {
		if (block_id <= DISPLAY_MISR_HDMI) {
		intf_base = (char *)mdss_mdp_get_intf_base_addr(