Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3e2f79d authored by Linus Torvalds's avatar Linus Torvalds
Browse files


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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">

* 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
parents b0fbfb0c ebdc8289
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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,