Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

authored by

Hans Verkuil and committed by
Mauro Carvalho Chehab
df3cfa6d 94384014

+4 -4
-4
drivers/media/usb/usbvision/usbvision-core.c
··· 1791 1791 usbvision->num_frames--; 1792 1792 } 1793 1793 1794 - spin_lock_init(&usbvision->queue_lock); 1795 - init_waitqueue_head(&usbvision->wait_frame); 1796 - init_waitqueue_head(&usbvision->wait_stream); 1797 - 1798 1794 /* Allocate all buffers */ 1799 1795 for (i = 0; i < usbvision->num_frames; i++) { 1800 1796 usbvision->frame[i].index = i;
+4
drivers/media/usb/usbvision/usbvision-video.c
··· 1520 1520 1521 1521 usbvision->nr = usbvision_nr++; 1522 1522 1523 + spin_lock_init(&usbvision->queue_lock); 1524 + init_waitqueue_head(&usbvision->wait_frame); 1525 + init_waitqueue_head(&usbvision->wait_stream); 1526 + 1523 1527 usbvision->have_tuner = usbvision_device_data[model].tuner; 1524 1528 if (usbvision->have_tuner) 1525 1529 usbvision->tuner_type = usbvision_device_data[model].tuner_type;