Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

[karo-tx-linux.git] / arch / x86 / boot / video.c

diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
index f767164cd5df91e1aaf2088fca44a3a26213f69c..43eda284d27fe96c2a4d407273f4b8d61bae87e2 100644 (file)
--- a/arch/x86/boot/video.c
+++ b/arch/x86/boot/video.c
@@ -298,11 +298,18 @@ static void restore_screen(void)
        }
 
        /* Restore cursor position */
+       if (saved.curx >= xs)
+               saved.curx = xs-1;
+       if (saved.cury >= ys)
+               saved.cury = ys-1;
+
        initregs(&ireg);
        ireg.ah = 0x02;         /* Set cursor position */
        ireg.dh = saved.cury;
        ireg.dl = saved.curx;
        intcall(0x10, &ireg, NULL);
+
+       store_cursor_position();
 }
 
 void set_video(void)