rkfb:fix rk30lcdc win2 crash
authoryxj <yxj@rock-chips.com>
Fri, 10 Aug 2012 02:12:36 +0000 (10:12 +0800)
committeryxj <yxj@rock-chips.com>
Wed, 29 Aug 2012 07:45:25 +0000 (15:45 +0800)
drivers/video/rockchip/rk_fb.c

index 88d51b26435a1e42b7ce0a58d50433c7b9afc892..66dd7845a16afd7fc590083e7f248329d94beb25 100644 (file)
@@ -1019,21 +1019,13 @@ int rk_fb_register(struct rk_lcdc_device_driver *dev_drv,
 
     if(id == 0)
     {
-           fb_inf->fb[fb_inf->num_fb-2]->fbops->fb_open(fb_inf->fb[fb_inf->num_fb-2],1);
-           fb_inf->fb[fb_inf->num_fb-2]->fbops->fb_set_par(fb_inf->fb[fb_inf->num_fb-2]);
-               #ifdef  CONFIG_LOGO_LINUX_BMP
-               if(fb_prepare_bmp_logo(fb_inf->fb[fb_inf->num_fb-2], FB_ROTATE_UR)) {
+           fb_inf->fb[fb_inf->num_fb-3]->fbops->fb_open(fb_inf->fb[fb_inf->num_fb-3],1);
+           fb_inf->fb[fb_inf->num_fb-3]->fbops->fb_set_par(fb_inf->fb[fb_inf->num_fb-3]);
+           if(fb_prepare_logo(fb_inf->fb[fb_inf->num_fb-3], FB_ROTATE_UR)) {
                /* Start display and show logo on boot */
-               fb_set_cmap(&fb_inf->fb[fb_inf->num_fb-2]->cmap, fb_inf->fb[fb_inf->num_fb-2]);
-               fb_show_bmp_logo(fb_inf->fb[fb_inf->num_fb-2], FB_ROTATE_UR);
-                       fb_inf->fb[fb_inf->num_fb-2]->fbops->fb_pan_display(&(fb_inf->fb[fb_inf->num_fb-2]->var), fb_inf->fb[fb_inf->num_fb-2]);
-           }
-               #else
-               if(fb_prepare_logo(fb_inf->fb[fb_inf->num_fb-2], FB_ROTATE_UR)) {
-               /* Start display and show logo on boot */
-               fb_set_cmap(&fb_inf->fb[fb_inf->num_fb-2]->cmap, fb_inf->fb[fb_inf->num_fb-2]);
-               fb_show_logo(fb_inf->fb[fb_inf->num_fb-2], FB_ROTATE_UR);
-                       fb_inf->fb[fb_inf->num_fb-2]->fbops->fb_pan_display(&(fb_inf->fb[fb_inf->num_fb-2]->var), fb_inf->fb[fb_inf->num_fb-2]);
+               fb_set_cmap(&fb_inf->fb[fb_inf->num_fb-3]->cmap, fb_inf->fb[fb_inf->num_fb-3]);
+               fb_show_logo(fb_inf->fb[fb_inf->num_fb-3], FB_ROTATE_UR);
+               fb_inf->fb[fb_inf->num_fb-3]->fbops->fb_pan_display(&(fb_inf->fb[fb_inf->num_fb-3]->var), fb_inf->fb[fb_inf->num_fb-3]);
            }
                #endif
     }