Commit dc60de33 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8779): v4l: fix more incorrect video_register_device result checks 



Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent cba99ae8

drivers/media/video/bw-qcam.c

+1 −2
Original line number Diff line number Diff line
@@ -946,8 +946,7 @@ static int init_bwqcam(struct parport *port) 


	printk(KERN_INFO "Connectix Quickcam on %s\n", qcam->pport->name);



	if(video_register_device(&qcam->vdev, VFL_TYPE_GRABBER, video_nr)==-1)

	{

	if (video_register_device(&qcam->vdev, VFL_TYPE_GRABBER, video_nr) < 0) {

		parport_unregister_device(qcam->pdev);

		kfree(qcam);

		return -ENODEV;

drivers/media/video/c-qcam.c

+1 −2
Original line number Diff line number Diff line
@@ -787,8 +787,7 @@ static int init_cqcam(struct parport *port) 


	parport_release(qcam->pdev);



	if (video_register_device(&qcam->vdev, VFL_TYPE_GRABBER, video_nr)==-1)

	{

	if (video_register_device(&qcam->vdev, VFL_TYPE_GRABBER, video_nr) < 0) {

		printk(KERN_ERR "Unable to register Colour QuickCam on %s\n",

		       qcam->pport->name);

		parport_unregister_device(qcam->pdev);

drivers/media/video/cpia.c

+1 −1
Original line number Diff line number Diff line
@@ -3955,7 +3955,7 @@ struct cam_data *cpia_register_camera(struct cpia_camera_ops *ops, void *lowleve 
	camera->lowlevel_data = lowlevel;



	/* register v4l device */

	if (video_register_device(&camera->vdev, VFL_TYPE_GRABBER, video_nr) == -1) {

	if (video_register_device(&camera->vdev, VFL_TYPE_GRABBER, video_nr) < 0) {

		kfree(camera);

		printk(KERN_DEBUG "video_register_device failed\n");

		return NULL;

drivers/media/video/cpia2/cpia2_v4l.c

+1 −2
Original line number Diff line number Diff line
@@ -1958,8 +1958,7 @@ int cpia2_register_camera(struct camera_data *cam) 
	reset_camera_struct_v4l(cam);



	/* register v4l device */

	if (video_register_device

	    (cam->vdev, VFL_TYPE_GRABBER, video_nr) == -1) {

	if (video_register_device(cam->vdev, VFL_TYPE_GRABBER, video_nr) < 0) {

		ERR("video_register_device failed\n");

		video_device_release(cam->vdev);

		return -ENODEV;

drivers/media/video/se401.c

+1 −1
Original line number Diff line number Diff line
@@ -1397,7 +1397,7 @@ static int se401_probe(struct usb_interface *intf, 
	mutex_init(&se401->lock);

	wmb();



	if (video_register_device(&se401->vdev, VFL_TYPE_GRABBER, video_nr) == -1) {

	if (video_register_device(&se401->vdev, VFL_TYPE_GRABBER, video_nr) < 0) {

		kfree(se401);

		err("video_register_device failed");

		return -EIO;

CRA Git | Maintained and supported by SUSTech CRA and CCSE