summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/video/fbdev/msm/mdss_mdp_overlay.c2
-rw-r--r--drivers/video/fbdev/msm/mdss_mdp_pipe.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_overlay.c b/drivers/video/fbdev/msm/mdss_mdp_overlay.c
index afcf49908ffe..dc9329ca2086 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_overlay.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_overlay.c
@@ -782,7 +782,7 @@ int mdss_mdp_overlay_pipe_setup(struct msm_fb_data_type *mfd,
if (pipe->priority <= left_blend_pipe->priority) {
pr_err("priority limitation. left:%d right%d\n",
left_blend_pipe->priority, pipe->priority);
- ret = -EPERM;
+ ret = -EBADSLT;
goto exit_fail;
} else {
pr_debug("pipe%d is a right_pipe\n", pipe->num);
diff --git a/drivers/video/fbdev/msm/mdss_mdp_pipe.c b/drivers/video/fbdev/msm/mdss_mdp_pipe.c
index cefc13dec875..51cbdafe0835 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_pipe.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_pipe.c
@@ -1025,7 +1025,8 @@ static struct mdss_mdp_pipe *mdss_mdp_pipe_init(struct mdss_mdp_mixer *mixer,
if (off >= npipes) {
pr_warn("priority limitation. l_pipe:%d. no low priority %d pipe type available.\n",
left_blend_pipe->num, type);
- return NULL;
+ pipe = ERR_PTR(-EBADSLT);
+ return pipe;
}
}