From: hjc <hjc@rock-chips.com>
Date: Mon, 13 Apr 2015 03:13:32 +0000 (+0800)
Subject: rk fb: do something when user set invalid config
X-Git-Tag: firefly_0821_release~4194
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=514c54f85c8e6ab6f7de36ee19858197edbd4f85;p=firefly-linux-kernel-4.4.55.git

rk fb: do something when user set invalid config

Signed-off-by: hjc <hjc@rock-chips.com>
---

diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index 53804baaa5b5..f9f4936a6838 100644
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -2196,6 +2196,9 @@ static int rk_fb_set_win_config(struct fb_info *info,
 		}
 	}
 
+	if (regs->win_num <= 0)
+		goto err_null_frame;
+
 	mutex_lock(&dev_drv->output_lock);
 
 	dev_drv->timeline_max++;
@@ -2266,6 +2269,13 @@ static int rk_fb_set_win_config(struct fb_info *info,
 err:
 	mutex_unlock(&dev_drv->output_lock);
 	return ret;
+err_null_frame:
+	kfree(regs);
+	for (j = 0; j < RK_MAX_BUF_NUM; j++)
+		win_data->rel_fence_fd[j] = -1;
+	win_data->ret_fence_fd = -1;
+	pr_info("win num = %d,null frame\n", regs->win_num);
+	return 0;
 }
 
 #if 1