diff options
| author |   Yinghai Lu <yinghai@kernel.org> | 2010-08-29 18:12:24 -0700 |
|---|---|---|
| committer |   H. Peter Anvin <hpa@linux.intel.com> | 2010-09-21 10:18:14 -0700 |
| commit | 83d9f65bdae6f6b34d75282c6618d3f50846849a (patch) | |
| tree | 07c6385742694ca9cbccf471ad0cb1d0b434e6d0 /arch | |
| parent | Linux 2.6.36-rc5 (diff) | |
| download | linux-dev-83d9f65bdae6f6b34d75282c6618d3f50846849a.tar.xz linux-dev-83d9f65bdae6f6b34d75282c6618d3f50846849a.zip | |
x86, setup: Fix earlyprintk=serial,ttyS0,115200
Torsten reported that there is garbage output,
after commit 8fee13a48e4879fba57725f6d9513df4bfa8e9f3 (x86,
setup: enable early console output from the decompressor)
It turns out we missed the offset for that case.
Reported-by: Torsten Kaiser <just.for.lkml@googlemail.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <4C7B0578.8090807@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/boot/early_serial_console.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/early_serial_console.c b/arch/x86/boot/early_serial_console.c index 030f4b93e255..407a8e26f0a7 100644 --- a/arch/x86/boot/early_serial_console.c +++ b/arch/x86/boot/early_serial_console.c @@ -58,7 +58,7 @@ static void parse_earlyprintk(void) if (arg[pos] == ',') pos++; - if (!strncmp(arg, "ttyS", 4)) { + if (!strncmp(arg + pos, "ttyS", 4)) { static const int bases[] = { 0x3f8, 0x2f8 }; int idx = 0; |