Merge branch 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / video / console / fbcon.c

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 471a9a60376ae82a07a921e416b0ec35fb4dbdfe..3a44695b9c09b6c5c46b8fe9735b53df436177f8 100644 (file)
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -1082,7 +1082,6 @@ static void fbcon_init(struct vc_data *vc, int init)
        new_rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
        new_cols /= vc->vc_font.width;
        new_rows /= vc->vc_font.height;
-       vc_resize(vc, new_cols, new_rows);
 
        /*
         * We must always set the mode. The mode of the previous console
@@ -1111,10 +1110,11 @@ static void fbcon_init(struct vc_data *vc, int init)
         *  vc_{cols,rows}, but we must not set those if we are only
         *  resizing the console.
         */
-       if (!init) {
+       if (init) {
                vc->vc_cols = new_cols;
                vc->vc_rows = new_rows;
-       }
+       } else
+               vc_resize(vc, new_cols, new_rows);
 
        if (logo)
                fbcon_prepare_logo(vc, info, cols, rows, new_cols, new_rows);