From: yxj <yxj@rock-chips.com>
Date: Fri, 27 Apr 2012 09:26:09 +0000 (+0800)
Subject: rk30fb:lcd_null.c use head file rk_screen.h replace screen.h
X-Git-Tag: firefly_0821_release~9286
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e372e904d2d74b427e243a02d0de4f415c5cd0e3;p=firefly-linux-kernel-4.4.55.git

rk30fb:lcd_null.c use head file rk_screen.h replace screen.h

	when screen is null,do not register it
---

diff --git a/drivers/video/display/screen/lcd_null.c b/drivers/video/display/screen/lcd_null.c
index add557adbf05..9871f653e83c 100755
--- a/drivers/video/display/screen/lcd_null.c
+++ b/drivers/video/display/screen/lcd_null.c
@@ -4,7 +4,7 @@
 #include "../../rk29_fb.h"
 #include <mach/gpio.h>
 #include <mach/iomux.h>
-#include "screen.h"
+#include <linux/rk_screen.h>
 
 void set_lcd_info(struct rk29fb_screen *screen, struct rk29lcd_info *lcd_info)
 {
diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index 16b0ef651e63..8a9a78bd531a 100644
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -819,6 +819,12 @@ int rk_fb_register(struct rk_lcdc_device_driver *dev_drv,
 	{
 		dev_drv->screen_ctr_info->set_screen_info(dev_drv->screen,
 			dev_drv->screen_ctr_info->lcd_info);
+		if(SCREEN_NULL==dev_drv->screen->type)
+		{
+			printk(KERN_WARNING "no display device on lcdc%d!?\n",dev_drv->id);
+			fb_inf->num_lcdc--;
+			return -ENODEV;
+		}
 		if(dev_drv->screen_ctr_info->io_init)
 			dev_drv->screen_ctr_info->io_init(NULL);
 	}