31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Date: Fri, 20 Apr 2012 16:53:32 -0700
|
|
Subject: [025/106] staging: line6: toneport.c: remove err() usage
|
|
|
|
commit aa8f827a4d7dbea98a9076a4f85b1317391dc031 upstream.
|
|
|
|
err() was a very old USB-specific macro that I thought had
|
|
gone away. This patch removes it from being used in the
|
|
driver and uses dev_err() instead.
|
|
|
|
CC: Markus Grabner <grabner@icg.tugraz.at>
|
|
CC: Stefan Hajnoczi <stefanha@gmail.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/staging/line6/toneport.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/staging/line6/toneport.c b/drivers/staging/line6/toneport.c
|
|
index b754f69..31b624b 100644
|
|
--- a/drivers/staging/line6/toneport.c
|
|
+++ b/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;
|
|
}
|
|
|