From 1c81d5115874a8cd841af788359755e5cecde72f Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 20 Apr 2012 16:53:59 -0700
Subject: [PATCH] --- yaml --- r: 303584 b: refs/heads/master c:
 461863df3c8d4402495684eff9c11cc7e3f8aaea h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/serial/option.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 827f90813e6c..4e00c407e171 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 085fb962623b7278fd2f33a8604c37dd22d06b70
+refs/heads/master: 461863df3c8d4402495684eff9c11cc7e3f8aaea
diff --git a/trunk/drivers/usb/serial/option.c b/trunk/drivers/usb/serial/option.c
index 836cfa9a515f..9b3c4a48ef6d 100644
--- a/trunk/drivers/usb/serial/option.c
+++ b/trunk/drivers/usb/serial/option.c
@@ -1412,7 +1412,7 @@ static void option_instat_callback(struct urb *urb)
 				req_pkt->bRequestType, req_pkt->bRequest);
 		}
 	} else
-		err("%s: error %d", __func__, status);
+		dev_err(&port->dev, "%s: error %d\n", __func__, status);
 
 	/* Resubmit urb so we continue receiving IRQ data */
 	if (status != -ESHUTDOWN && status != -ENOENT) {