summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorFancy Fang <chen.fang@freescale.com>2015-10-14 11:26:27 +0800
committerFancy Fang <chen.fang@freescale.com>2015-10-14 17:22:17 +0800
commit459d01cbda39e51029c55e583909ef645037b7f3 (patch)
tree7a4678870da498ddbf79537d293ac7787044c772 /drivers
parente35e15983e14caf48dadf235bc6b33014818c62e (diff)
MLK-11700 video: mxsfb: correct the fb pan display ret value
The fb_pan_display() return value should be corrected according to the wait_for_completion_timeout() return value. Signed-off-by: Fancy Fang <chen.fang@freescale.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/mxsfb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index f139016827c1..3fa83dbb8629 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -963,13 +963,13 @@ static int mxsfb_pan_display(struct fb_var_screeninfo *var,
host->base + LCDC_CTRL1 + REG_SET);
ret = wait_for_completion_timeout(&host->flip_complete, HZ / 2);
- if (ret < 0) {
+ if (!ret) {
dev_err(fb_info->device,
"mxs wait for pan flip timeout\n");
- ret = -ETIMEDOUT;
+ return -ETIMEDOUT;
}
- return ret;
+ return 0;
}
static int mxsfb_mmap(struct fb_info *info, struct vm_area_struct *vma)