From cb948773ef2b91e3fb556ae5092bd4909d04e641 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 20 Apr 2012 16:53:29 -0700
Subject: [PATCH] --- yaml --- r: 303570 b: refs/heads/master c:
 2b8dec323d3409308817820247222806d0356cdf h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/staging/line6/driver.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bbf330ca87fe..2a4508bb3eda 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2705c0d2d8776e7e51dd0dfa8edf9e6c629902b
+refs/heads/master: 2b8dec323d3409308817820247222806d0356cdf
diff --git a/trunk/drivers/staging/line6/driver.c b/trunk/drivers/staging/line6/driver.c
index e8023afd3656..2e602e192b07 100644
--- a/trunk/drivers/staging/line6/driver.c
+++ b/trunk/drivers/staging/line6/driver.c
@@ -1307,7 +1307,8 @@ static int __init line6_init(void)
 	retval = usb_register(&line6_driver);
 
 	if (retval) {
-		err("usb_register failed. Error number %d", retval);
+		printk(KERN_ERR KBUILD_MODNAME
+		       ": usb_register failed. Error number %d\n", retval);
 		return retval;
 	}
 
@@ -1315,7 +1316,7 @@ static int __init line6_init(void)
 					GFP_KERNEL);
 
 	if (line6_request_version == NULL) {
-		err("Out of memory");
+		printk(KERN_ERR KBUILD_MODNAME ":Out of memory\n");
 		return -ENOMEM;
 	}