Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-15 12:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Staging: media: easycap: remove err() usage

Browse Source 
err() was a very old USB-specific macro that I thought had
gone away.  This patch removes it from being used in the
driver and uses dev_err() instead.

Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Tomas Winkler <tomas.winkler@intel.com>
Cc: Jesper Juhl <jj@chaosbits.net>
Cc: Ezequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2012-04-23 17:13:54 -07:00
parent 923faa6a8c
commit dfcf931a94
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/media/easycap/easycap_main.c
View File

@ -3578,7 +3578,8 @@ static int easycap_usb_probe(struct usb_interface *intf,
if (0 != (video_register_device(&(peasycap->video_device), if (0 != (video_register_device(&(peasycap->video_device),
VFL_TYPE_GRABBER, -1))) { 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)); videodev_release(&(peasycap->video_device));
return -ENODEV; return -ENODEV;
} }
@ -3822,7 +3823,8 @@ static int easycap_usb_probe(struct usb_interface *intf,
rc = easycap_alsa_probe(peasycap); rc = easycap_alsa_probe(peasycap);
if (rc) { if (rc) {
err("easycap_alsa_probe() rc = %i\n", rc); dev_err(&intf->dev, "easycap_alsa_probe() rc = %i\n",
rc);
return -ENODEV; return -ENODEV;
} }