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 add557adbf056359d834e00729235dcc4e5e7ba0..9871f653e83cebd2c42d3b99fd5c4558606e30b4 100755 (executable)
--- 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 16b0ef651e63f9550092e0deb2b7dc9d3d3758ab..8a9a78bd531a978ea702cb89355c35a7ed4afc78 100644 (file)
--- 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);
        }