mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-25 11:40:53 +07:00
[media] cx18: Move spinlock and vb_type initialisation into stream_init
The initialisation of vb_type in serialized_open was preventing REQBUFS from working reliably. Remove it, and move the spinlock into stream_init for good measure - it's only used when we have a stream that supports videobuf anyway. Signed-off-by: Simon Farnsworth <simon.farnsworth@onelan.co.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
d9c417b5a4
commit
612031c077
@ -810,9 +810,6 @@ static int cx18_serialized_open(struct cx18_stream *s, struct file *filp)
|
||||
item->cx = cx;
|
||||
item->type = s->type;
|
||||
|
||||
spin_lock_init(&s->vbuf_q_lock);
|
||||
s->vb_type = 0;
|
||||
|
||||
item->open_id = cx->open_id++;
|
||||
filp->private_data = &item->fh;
|
||||
|
||||
|
@ -275,6 +275,8 @@ static void cx18_stream_init(struct cx18 *cx, int type)
|
||||
init_timer(&s->vb_timeout);
|
||||
spin_lock_init(&s->vb_lock);
|
||||
if (type == CX18_ENC_STREAM_TYPE_YUV) {
|
||||
spin_lock_init(&s->vbuf_q_lock);
|
||||
|
||||
s->vb_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
|
||||
videobuf_queue_vmalloc_init(&s->vbuf_q, &cx18_videobuf_qops,
|
||||
&cx->pci_dev->dev, &s->vbuf_q_lock,
|
||||
|
Loading…
Reference in New Issue
Block a user