diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-16 16:36:37 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-16 16:36:37 -0800 |
commit | 6a8c62f3e97fdf184fde60bc99155476e8e9cd55 (patch) | |
tree | 71b818d584f79baf1a192df65c758a592a63360d /arch/x86/platform/efi/early_printk.c | |
parent | b46d0c46ccaa366a5bb8ac709fdf2bcaa76221fd (diff) | |
parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
download | talos-obmc-linux-6a8c62f3e97fdf184fde60bc99155476e8e9cd55.tar.gz talos-obmc-linux-6a8c62f3e97fdf184fde60bc99155476e8e9cd55.zip |
Merge 3.13-rc4 into tty-next
We want the fixes in here as well.
Diffstat (limited to 'arch/x86/platform/efi/early_printk.c')
-rw-r--r-- | arch/x86/platform/efi/early_printk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/platform/efi/early_printk.c b/arch/x86/platform/efi/early_printk.c index 6599a0027b76..81b506d5befd 100644 --- a/arch/x86/platform/efi/early_printk.c +++ b/arch/x86/platform/efi/early_printk.c @@ -142,7 +142,7 @@ early_efi_write(struct console *con, const char *str, unsigned int num) efi_y += font->height; } - if (efi_y + font->height >= si->lfb_height) { + if (efi_y + font->height > si->lfb_height) { u32 i; efi_y -= font->height; |