From: zwl <zwl@rockchips.com>
Date: Fri, 17 Oct 2014 03:04:11 +0000 (+0800)
Subject: rk fb:
X-Git-Tag: firefly_0821_release~4568
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a56dbc90502c9cabb64824aefea78227a597094f;p=firefly-linux-kernel-4.4.55.git

rk fb:
	* fix get share dma buf fd failed when stop and start system

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

diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index b8cdcdfb2e4e..c9c775db3592 100755
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -2634,9 +2634,15 @@ static int rk_fb_ioctl(struct fb_info *info, unsigned int cmd,
 		}
 	case RK_FBIOGET_DMABUF_FD:
 		{
-			int fd =
-			    ion_share_dma_buf_fd(rk_fb->ion_client,
-						 win->area[0].ion_hdl);
+			int fd = -1;
+
+			if (IS_ERR_OR_NULL(fb_par->ion_hdl)) {
+				dev_err(info->dev,
+					"get dma_buf fd failed,ion handle is err\n");
+				return PTR_ERR(fb_par->ion_hdl);
+			}
+			fd = ion_share_dma_buf_fd(rk_fb->ion_client,
+						  fb_par->ion_hdl);
 			if (fd < 0) {
 				dev_err(info->dev,
 					"ion_share_dma_buf_fd failed\n");