3 files changed, 4 insertions, 6 deletions

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 9c092b8d64e6..8745637e4b7e 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -370,7 +370,6 @@ static void fb_flashcursor(struct work_struct *work)
 {
         struct fb_info *info = container_of(work, struct fb_info, queue);
         struct fbcon_ops *ops = info->fbcon_par;
-        struct display *p;
         struct vc_data *vc = NULL;
         int c;
         int mode;
@@ -386,7 +385,6 @@ static void fb_flashcursor(struct work_struct *work)
                 return;
         }
 
-        p = &fb_display[vc->vc_num];
         c = scr_readw((u16 *) vc->vc_pos);
         mode = (!ops->cursor_flash || ops->cursor_state.enable) ?
                 CM_ERASE : CM_DRAW;
@@ -823,10 +821,10 @@ static int set_con2fb_map(int unit, int newidx, int user)
         if (oldidx == newidx)
                 return 0;
 
-        if (!info || fbcon_has_exited)
+        if (!info)
                 return -EINVAL;
 
-        if (!err && !search_for_mapped_con()) {
+        if (!search_for_mapped_con() || !con_is_bound(&fb_con)) {
                 info_idx = newidx;
                 return fbcon_takeover(0);
         }
diff --git a/drivers/video/console/font_mini_4x6.c b/drivers/video/console/font_mini_4x6.c
index a19a7f33133e..fa6e698e63c4 100644
--- a/drivers/video/console/font_mini_4x6.c
+++ b/drivers/video/console/font_mini_4x6.c
@@ -1,5 +1,5 @@
 
-/* Hand composed "Miniscule" 4x6 font, with binary data generated using
+/* Hand composed "Minuscule" 4x6 font, with binary data generated using
  * Perl stub.
  *
  * Use 'perl -x mini_4x6.c < mini_4x6.c > new_version.c' to regenerate
diff --git a/drivers/video/console/tileblit.c b/drivers/video/console/tileblit.c
index 0056a41e5c35..15e8e1a89c45 100644
--- a/drivers/video/console/tileblit.c
+++ b/drivers/video/console/tileblit.c
@@ -83,7 +83,7 @@ static void tile_cursor(struct vc_data *vc, struct fb_info *info, int mode,
                         int softback_lines, int fg, int bg)
 {
         struct fb_tilecursor cursor;
-        int use_sw = (vc->vc_cursor_type & 0x01);
+        int use_sw = (vc->vc_cursor_type & 0x10);
 
         cursor.sx = vc->vc_x;
         cursor.sy = vc->vc_y;