Merge branch 'cris_move' of git://www.jni.nu/cris

[linux-2.6-omap-h63xx.git] / drivers / video / console / newport_con.c

diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c
index dda0586ab3f333d920c97327d1e8aef2479f8e9e..d31b203bf6549bdb94b337e9f28f7265d8b544e4 100644 (file)
--- a/drivers/video/console/newport_con.c
+++ b/drivers/video/console/newport_con.c
@@ -98,14 +98,19 @@ static inline void newport_init_cmap(void)
        }
 }
 
-static void newport_show_logo(void)
+static const struct linux_logo *newport_show_logo(void)
 {
 #ifdef CONFIG_LOGO_SGI_CLUT224
        const struct linux_logo *logo = fb_find_logo(8);
-       const unsigned char *clut = logo->clut;
-       const unsigned char *data = logo->data;
+       const unsigned char *clut;
+       const unsigned char *data;
        unsigned long i;
 
+       if (!logo)
+               return NULL;
+       clut = logo->clut;
+       data = logo->data;
+
        for (i = 0; i < logo->clutsize; i++) {
                newport_bfwait(npregs);
                newport_cmap_setaddr(npregs, i + 0x20);
@@ -123,6 +128,8 @@ static void newport_show_logo(void)
 
        for (i = 0; i < logo->width*logo->height; i++)
                npregs->go.hostrw0 = *data++ << 24;
+
+       return logo;
 #endif /* CONFIG_LOGO_SGI_CLUT224 */
 }
 
@@ -465,9 +472,10 @@ static int newport_switch(struct vc_data *vc)
        npregs->cset.topscan = 0x3ff;
 
        if (!logo_drawn) {
-               newport_show_logo();
-               logo_drawn = 1;
-               logo_active = 1;
+               if (newport_show_logo()) {
+                       logo_drawn = 1;
+                       logo_active = 1;
+               }
        }
 
        return 1;