Skip to content

Commit

Permalink
Staging: media: easycap: remove err() usage
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed Apr 24, 2012
1 parent 923faa6 commit dfcf931
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/staging/media/easycap/easycap_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit dfcf931

Please sign in to comment.