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

Commit 612031c0 authored by Simon Farnsworth's avatar Simon Farnsworth Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarSimon Farnsworth <simon.farnsworth@onelan.co.uk>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d9c417b5

drivers/media/video/cx18/cx18-fileops.c

+0 −3
Original line number Diff line number Diff line
@@ -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;

drivers/media/video/cx18/cx18-streams.c

+2 −0
Original line number Diff line number Diff line
@@ -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,