Merge "msm: mdss: fix wb_ctl_alloc to allow use of rotator2" (e04d57d5) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_ctl.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1177,8 +1177,9 @@ struct mdss_mdp_mixer *mdss_mdp_wb_mixer_alloc(int rotator)
		{
		struct mdss_mdp_ctl *ctl = NULL;
		struct mdss_mdp_mixer *mixer = NULL;
		u32 offset = mdss_res->nctl - mdss_res->nmixers_wb;

		ctl = mdss_mdp_ctl_alloc(mdss_res, mdss_res->nmixers_intf);
		ctl = mdss_mdp_ctl_alloc(mdss_res, offset);
		if (!ctl) {
		pr_debug("unable to allocate wb ctl\n");
		return NULL;