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

Commit 7d87fa91 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: update error codes returned to user space"

parents bdfbcdd0 84af7689

drivers/video/msm/mdss/mdss_mdp_overlay.c

+2 −2
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ static int mdss_mdp_overlay_pipe_setup(struct msm_fb_data_type *mfd, 


	if (req->flags & MDP_ROT_90) {

		pr_err("unsupported inline rotation\n");

		return -ENOTSUPP;

		return -EOPNOTSUPP;

	}



	if ((req->dst_rect.w > MAX_DST_W) || (req->dst_rect.h > MAX_DST_H)) {
@@ -438,7 +438,7 @@ static int mdss_mdp_overlay_pipe_setup(struct msm_fb_data_type *mfd, 


		if (pipe == NULL) {

			pr_err("error allocating pipe\n");

			return -ENOMEM;

			return -ENODEV;

		}



		ret = mdss_mdp_pipe_map(pipe);

drivers/video/msm/mdss/mdss_mdp_pipe.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ int mdss_mdp_smp_reserve(struct mdss_mdp_pipe *pipe) 
		for (; i >= 0; i--)

			mdss_mdp_smp_mmb_free(pipe->smp_map[i].reserved,

				false);

		rc = -ENOMEM;

		rc = -ENOBUFS;

	}

	mutex_unlock(&mdss_mdp_smp_lock);