]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
[media] usbvision: return valid error in usbvision_register_video()
authorHans Verkuil <hans.verkuil@cisco.com>
Mon, 20 Jul 2015 12:59:30 +0000 (09:59 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Tue, 11 Aug 2015 09:50:08 +0000 (06:50 -0300)
Don't return -1, return a proper error code.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/usb/usbvision/usbvision-video.c

index ea67c8c05bcd5f177dce36a88f0cdb9590d803cc..82a65a495c24491fe2e0b30ee7ef92ea6c72eb62 100644 (file)
@@ -1304,6 +1304,8 @@ static void usbvision_unregister_video(struct usb_usbvision *usbvision)
 /* register video4linux devices */
 static int usbvision_register_video(struct usb_usbvision *usbvision)
 {
+       int res = -ENOMEM;
+
        /* Video Device: */
        usbvision_vdev_init(usbvision, &usbvision->vdev,
                              &usbvision_video_template, "USBVision Video");
@@ -1330,7 +1332,7 @@ static int usbvision_register_video(struct usb_usbvision *usbvision)
                "USBVision[%d]: video_register_device() failed\n",
                        usbvision->nr);
        usbvision_unregister_video(usbvision);
-       return -1;
+       return res;
 }
 
 /*