From: Huang Jiachai Date: Fri, 11 Sep 2015 07:52:37 +0000 (+0800) Subject: video: rockchip: rb: return error value to user when an exception is configed X-Git-Tag: firefly_0821_release~3791 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0b2621acc93baa1eb1359f0e2b1f82c6c79eb77e;p=firefly-linux-kernel-4.4.55.git video: rockchip: rb: return error value to user when an exception is configed Change-Id: I81697f24c6914f07f8facad4e23ad4fb6824190c Signed-off-by: Huang Jiachai --- diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c index 8c0bc7addb3b..d6ff9d67d342 100755 --- a/drivers/video/rockchip/rk_fb.c +++ b/drivers/video/rockchip/rk_fb.c @@ -2609,7 +2609,7 @@ static int rk_fb_ioctl(struct fb_info *info, unsigned int cmd, int enable; /* enable fb:1 enable;0 disable */ int ovl; /* overlay:0 win1 on the top of win0;1,win0 on the top of win1 */ int num_buf; /* buffer_number */ - int ret; + int ret = 0; struct rk_fb_win_cfg_data win_data; unsigned int dsp_addr[4][4]; int list_stat; @@ -2844,7 +2844,7 @@ static int rk_fb_ioctl(struct fb_info *info, unsigned int cmd, }; dev_drv->wait_fs = win_data.wait_fs; - rk_fb_set_win_config(info, &win_data); + ret = rk_fb_set_win_config(info, &win_data); if (copy_to_user((struct rk_fb_win_cfg_data __user *)arg, &win_data, sizeof(win_data))) { @@ -2862,7 +2862,7 @@ static int rk_fb_ioctl(struct fb_info *info, unsigned int cmd, break; } - return 0; + return ret; } static int rk_fb_blank(int blank_mode, struct fb_info *info)