From 6c37ff669a008750772c99306d0b5014d706207d Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Mon, 30 Jul 2012 14:40:15 -0700
Subject: [PATCH] --- yaml --- r: 319903 b: refs/heads/master c:
 b778b3f25baf46dd88f16d51f1682828be0aa2ad h: refs/heads/master i:   319901:
 9cf6299af40b4166d48c5bff8b7b48d05e98723e   319899:
 36d1535408ea898d3300a76816dfed5a9348e9b2   319895:
 90245017ea71146af93bb3a66fdd1e40f25cd8d5   319887:
 1d098e75af7943ad570303df2ec45bd3b06fa040   319871:
 d1f6efdb5ca123a0a8c1809810b48db3eee376e6 v: v3

---
 [refs]                  |  2 +-
 trunk/sound/core/misc.c | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 868e33c3fb26..0e97b5ba2c5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 533574c6bc30cf526cc1c41bde050c854a945efb
+refs/heads/master: b778b3f25baf46dd88f16d51f1682828be0aa2ad
diff --git a/trunk/sound/core/misc.c b/trunk/sound/core/misc.c
index 768167925409..30e027ecf4da 100644
--- a/trunk/sound/core/misc.c
+++ b/trunk/sound/core/misc.c
@@ -68,6 +68,7 @@ void __snd_printk(unsigned int level, const char *path, int line,
 {
 	va_list args;
 #ifdef CONFIG_SND_VERBOSE_PRINTK
+	int kern_level;
 	struct va_format vaf;
 	char verbose_fmt[] = KERN_DEFAULT "ALSA %s:%d %pV";
 #endif
@@ -81,12 +82,16 @@ void __snd_printk(unsigned int level, const char *path, int line,
 #ifdef CONFIG_SND_VERBOSE_PRINTK
 	vaf.fmt = format;
 	vaf.va = &args;
-	if (format[0] == '<' && format[2] == '>') {
-		memcpy(verbose_fmt, format, 3);
-		vaf.fmt = format + 3;
+
+	kern_level = printk_get_level(format);
+	if (kern_level) {
+		const char *end_of_header = printk_skip_level(format);
+		memcpy(verbose_fmt, format, end_of_header - format);
+		vaf.fmt = end_of_header;
 	} else if (level)
-		memcpy(verbose_fmt, KERN_DEBUG, 3);
+		memcpy(verbose_fmt, KERN_DEBUG, sizeof(KERN_DEBUG) - 1);
 	printk(verbose_fmt, sanity_file_name(path), line, &vaf);
+
 #else
 	vprintk(format, args);
 #endif