From 72c13ed9078f55854db93b3529a05c2630be9ee6 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 20 Apr 2012 16:53:22 -0700
Subject: [PATCH] --- yaml --- r: 304412 b: refs/heads/master c:
 151373aaff439ab4b1ff7f43cff2cbdd9f4a94f5 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e0c2a8b2f37a..4d6cd3d7782c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f860b0cd8d185f18273921cc75543addf89f05ee
+refs/heads/master: 151373aaff439ab4b1ff7f43cff2cbdd9f4a94f5
diff --git a/trunk/drivers/staging/comedi/drivers/vmk80xx.c b/trunk/drivers/staging/comedi/drivers/vmk80xx.c
index 856d0ea6007f..a7db6862f75c 100644
--- a/trunk/drivers/staging/comedi/drivers/vmk80xx.c
+++ b/trunk/drivers/staging/comedi/drivers/vmk80xx.c
@@ -297,7 +297,9 @@ static void vmk80xx_rx_callback(struct urb *urb)
 		if (!usb_submit_urb(urb, GFP_KERNEL))
 			goto exit;
 
-		err("comedi#: vmk80xx: %s - submit urb failed\n", __func__);
+		dev_err(&urb->dev->dev,
+			"comedi#: vmk80xx: %s - submit urb failed\n",
+			__func__);
 
 		usb_unanchor_urb(urb);
 	}