diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-20 22:13:47 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-20 22:13:47 +0200 |
| commit | c3e2f79d2d483450cfc2b3ac4474a380e6c2615c (patch) | |
| tree | 9a350b151ae39ed5d3b7ca236fdb0c7adf8a3964 | |
| parent | Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 (diff) | |
| parent | dyndbg: fix for SOH in logging messages (diff) | |
| download | linux-c3e2f79d2d483450cfc2b3ac4474a380e6c2615c.tar.xz linux-c3e2f79d2d483450cfc2b3ac4474a380e6c2615c.zip | |
Merge tag 'driver-core-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull one more driver core fix from Greg Kroah-Hartman:
"Here is one fix for the dmesg line corruption problem that the
previous set of patches caused.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
* tag 'driver-core-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
dyndbg: fix for SOH in logging messages
| -rw-r--r-- | drivers/base/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index cdd01c52c629..5e6e00bc1652 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -1912,8 +1912,8 @@ int __dev_printk(const char *level, const struct device *dev, "DEVICE=+%s:%s", subsys, dev_name(dev)); } skip: - if (level[3]) - level_extra = &level[3]; /* skip past "<L>" */ + if (level[2]) + level_extra = &level[2]; /* skip past KERN_SOH "L" */ return printk_emit(0, level[1] - '0', dictlen ? dict : NULL, dictlen, |