From 780a3849b46d53a82df55b03d356a238fd488366 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Apr 2012 17:13:54 -0700 Subject: [PATCH] --- yaml --- r: 303591 b: refs/heads/master c: 5df77312047739b07d735a6b45ae13244d8f2b60 h: refs/heads/master i: 303589: 2e96803a9e3d49b32d624f3da42b44406b37ea91 303587: b2e4517eaa489aa5f8804d133afdce412735d056 303583: da5dd189af90a6fd8f96aba7b247eb7c7958aca7 v: v3 --- [refs] | 2 +- trunk/drivers/staging/media/easycap/easycap_main.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8c61bbdc5ee9..918b5809254c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec42899c2f9cf35e25e93c61ab9948e488de1825 +refs/heads/master: 5df77312047739b07d735a6b45ae13244d8f2b60 diff --git a/trunk/drivers/staging/media/easycap/easycap_main.c b/trunk/drivers/staging/media/easycap/easycap_main.c index d0fe34afc2e5..6f83d362ab0d 100644 --- a/trunk/drivers/staging/media/easycap/easycap_main.c +++ b/trunk/drivers/staging/media/easycap/easycap_main.c @@ -3578,7 +3578,8 @@ static int easycap_usb_probe(struct usb_interface *intf, if (0 != (video_register_device(&(peasycap->video_device), VFL_TYPE_GRABBER, -1))) { - err("Not able to register with videodev"); + dev_err(&intf->dev, + "Not able to register with videodev\n"); videodev_release(&(peasycap->video_device)); return -ENODEV; } @@ -3822,7 +3823,8 @@ static int easycap_usb_probe(struct usb_interface *intf, rc = easycap_alsa_probe(peasycap); if (rc) { - err("easycap_alsa_probe() rc = %i\n", rc); + dev_err(&intf->dev, "easycap_alsa_probe() rc = %i\n", + rc); return -ENODEV; }