From 3b16208bd1fd1085e31ad71f7bce0b154139abc1 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: 303567 b: refs/heads/master c:
 b864cbe7c7d2e9db04ff89a9a0da1035afe8081b h: refs/heads/master i:   303565:
 5c470e000591adca0c30aa6edefc4a09ce177d21   303563:
 c3f3cb83f46c791718189cbfc3f3c48c306441dc   303559:
 7e7e019b4f04a1f518575a4b3ec88318304953ce   303551:
 246d115c6b7059f7abeaabcfac649fd6fb7fe52c 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 c4401a5b862b..5658df51ad2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de15fe3ed9c3d959adb6c3ccd28dc63f4a1337a9
+refs/heads/master: b864cbe7c7d2e9db04ff89a9a0da1035afe8081b
diff --git a/trunk/drivers/staging/comedi/drivers/vmk80xx.c b/trunk/drivers/staging/comedi/drivers/vmk80xx.c
index 3d13ca6e1670..2dba3efdacfa 100644
--- a/trunk/drivers/staging/comedi/drivers/vmk80xx.c
+++ b/trunk/drivers/staging/comedi/drivers/vmk80xx.c
@@ -295,7 +295,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);
 	}