---

yaml --- r: 303626 b: refs/heads/master c: d372c41 h: refs/heads/master v: v3
git-mirror · Apr 25, 2012 · 5f48793 · 5f48793
1 parent 1e85a02
commit 5f48793
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a581c72a8e9e9955714e8f3b62c46312bea3f6ba
+refs/heads/master: d372c4197d642763a6fde0ed3baa7cfce78df22d
diff --git a/trunk/drivers/media/video/hdpvr/hdpvr-core.c b/trunk/drivers/media/video/hdpvr/hdpvr-core.c
@@ -303,15 +303,15 @@ static int hdpvr_probe(struct usb_interface *interface,
 	/* allocate memory for our device state and initialize it */
 	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
 	if (!dev) {
-		err("Out of memory");
+		dev_err(&interface->dev, "Out of memory\n");
 		goto error;
 	}
 
 	dev->workqueue = 0;
 
 	/* register v4l2_device early so it can be used for printks */
 	if (v4l2_device_register(&interface->dev, &dev->v4l2_dev)) {
-		err("v4l2_device_register failed");
+		dev_err(&interface->dev, "v4l2_device_register failed\n");
 		goto error;
 	}