Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[media] usbvision: move init code to probe() 



These things are only initialized if you start streaming video, but
they are also used in the disconnect function. So just init them
always during probe time.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 94384014

drivers/media/usb/usbvision/usbvision-core.c

+0 −4
Original line number Diff line number Diff line
@@ -1791,10 +1791,6 @@ int usbvision_frames_alloc(struct usb_usbvision *usbvision, int number_of_frames 
		usbvision->num_frames--;

	}



	spin_lock_init(&usbvision->queue_lock);

	init_waitqueue_head(&usbvision->wait_frame);

	init_waitqueue_head(&usbvision->wait_stream);



	/* Allocate all buffers */

	for (i = 0; i < usbvision->num_frames; i++) {

		usbvision->frame[i].index = i;

drivers/media/usb/usbvision/usbvision-video.c

+4 −0
Original line number Diff line number Diff line
@@ -1520,6 +1520,10 @@ static int usbvision_probe(struct usb_interface *intf, 


	usbvision->nr = usbvision_nr++;



	spin_lock_init(&usbvision->queue_lock);

	init_waitqueue_head(&usbvision->wait_frame);

	init_waitqueue_head(&usbvision->wait_stream);



	usbvision->have_tuner = usbvision_device_data[model].tuner;

	if (usbvision->have_tuner)

		usbvision->tuner_type = usbvision_device_data[model].tuner_type;