diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-23 17:13:54 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-23 17:13:54 -0700 |
| commit | dfcf931a94f660c677c08f9cc23e0ffc7ccca4f3 (patch) | |
| tree | d7d0518284eecf4a71b64fb6056bbe7577e212a9 /drivers/staging/media | |
| parent | 923faa6a8cc80ceff89214efbccce1497118ceed (diff) | |
| download | blackbird-op-linux-dfcf931a94f660c677c08f9cc23e0ffc7ccca4f3.tar.gz blackbird-op-linux-dfcf931a94f660c677c08f9cc23e0ffc7ccca4f3.zip | |
Staging: media: easycap: remove err() usage
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>
Diffstat (limited to 'drivers/staging/media')
| -rw-r--r-- | drivers/staging/media/easycap/easycap_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/media/easycap/easycap_main.c b/drivers/staging/media/easycap/easycap_main.c index d0fe34afc2e5..6f83d362ab0d 100644 --- a/drivers/staging/media/easycap/easycap_main.c +++ b/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; } |
