summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-08 08:36:24 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-13 05:46:51 +0900
commitc5a1a81c6a690de3e98e8894afa227d584929185 (patch)
tree4f1ecd8ce8234019b6376e5b6151a86e57aefcb3 /drivers
parent73b6448a7705298b2b10367a50fd063b27cdbeb8 (diff)
Revert dyndbg: fix for SOH in logging messages
This reverts commit 3d822616ca81881d8c19d0b473e79ba241c700de, which is ebdc82899ec5ed35af1c79ed6a4eeda69dad9b90 upstream, as it's not needed in the 3.5.y tree. Reported-by: Wouter M. Koolen <W.M.Koolen-Wijkstra@cwi.nl> Cc: Markus Trippelsdorf <markus@trippelsdorf.de> Cc: Jim Cromie <jim.cromie@gmail.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Jason Baron <jbaron@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c
index c5981227fcc5..b18138a9a710 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1895,8 +1895,8 @@ int __dev_printk(const char *level, const struct device *dev,
"DEVICE=+%s:%s", subsys, dev_name(dev));
}
skip:
- if (level[2])
- level_extra = &level[2]; /* skip past KERN_SOH "L" */
+ if (level[3])
+ level_extra = &level[3]; /* skip past "<L>" */
return printk_emit(0, level[1] - '0',
dictlen ? dict : NULL, dictlen,