Merge "mdss: mdp: prevent null pointer dereference in mixer width calculation" (cb0e386b) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_overlay.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -74,7 +74,7 @@ static inline bool is_ov_right_blend(struct mdp_rect *left_blend,
		static inline u32 left_lm_w_from_mfd(struct msm_fb_data_type *mfd)
		{
		struct mdss_mdp_ctl *ctl = mfd_to_ctl(mfd);
		return ctl->mixer_left->width;
		return (ctl && ctl->mixer_left) ? ctl->mixer_left->width : 0;
		}

		static int mdss_mdp_overlay_sd_ctrl(struct msm_fb_data_type *mfd,