Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[mirror_ubuntu-artful-kernel.git] / drivers / staging / media / easycap / easycap_main.c

diff --git a/drivers/staging/media/easycap/easycap_main.c b/drivers/staging/media/easycap/easycap_main.c
index 19d2d9d64236b2aa370149515165447747854fda..8269c77dbf7df5b2a9d860d304a06c806c88448a 100644 (file)
--- a/drivers/staging/media/easycap/easycap_main.c
+++ b/drivers/staging/media/easycap/easycap_main.c
@@ -3468,7 +3468,6 @@ static int easycap_register_video(struct easycap *peasycap)
 
        if (0 != (video_register_device(&(peasycap->video_device),
                                        VFL_TYPE_GRABBER, -1))) {
-               err("Not able to register with videodev");
                videodev_release(&(peasycap->video_device));
                return -ENODEV;
        }
@@ -3856,8 +3855,11 @@ static int easycap_usb_probe(struct usb_interface *intf,
                        peasycap->v4l2_device.name);
 
                rc = easycap_register_video(peasycap);
-               if (rc < 0)
+               if (rc < 0) {
+                       dev_err(&intf->dev,
+                               "Not able to register with videodev\n");
                        return -ENODEV;
+               }
                break;
        }
        /* 1: Audio control */
@@ -3997,7 +3999,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;
                }