sky2: Flow control frames recorded as dropped packets

[safe/jmp/linux-2.6] / drivers / video / console / vgacon.c

diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index 564643e..cc4bbbe 100644 (file)
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -586,7 +586,10 @@ static void vgacon_init(struct vc_data *c, int init)
        if (!vgacon_uni_pagedir[0] && p)
                con_set_default_unimap(c);
 
-       hide_boot_cursor(screen_info.flags & VIDEO_FLAGS_NOCURSOR);
+       /* Only set the default if the user didn't deliberately override it */
+       if (global_cursor_default == -1)
+               global_cursor_default =
+                       !(screen_info.flags & VIDEO_FLAGS_NOCURSOR);
 }
 
 static void vgacon_deinit(struct vc_data *c)