From 0a308a805f681d8bf3a59baed45a7f6853194055 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 20 Apr 2012 16:53:32 -0700
Subject: [PATCH] --- yaml --- r: 304409 b: refs/heads/master c:
 aa8f827a4d7dbea98a9076a4f85b1317391dc031 h: refs/heads/master i:   304407:
 9632dedf4669dfb8904507e2750dfb6c5a90ecb9 v: v3

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

diff --git a/[refs] b/[refs]
index e194691606a9..f2a61b8eb923 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2682dee3158ef140320d6e1c5467a481dc954154
+refs/heads/master: aa8f827a4d7dbea98a9076a4f85b1317391dc031
diff --git a/trunk/drivers/staging/line6/toneport.c b/trunk/drivers/staging/line6/toneport.c
index b754f69a29c4..31b624b63425 100644
--- a/trunk/drivers/staging/line6/toneport.c
+++ b/trunk/drivers/staging/line6/toneport.c
@@ -168,7 +168,7 @@ static int toneport_send_cmd(struct usb_device *usbdev, int cmd1, int cmd2)
 			      cmd1, cmd2, NULL, 0, LINE6_TIMEOUT * HZ);
 
 	if (ret < 0) {
-		err("send failed (error %d)\n", ret);
+		dev_err(&usbdev->dev, "send failed (error %d)\n", ret);
 		return ret;
 	}