From 1951517fccc58e168085e8b2fc4fc09baf49f982 Mon Sep 17 00:00:00 2001 From: Simon Farnsworth Date: Tue, 10 May 2011 10:49:50 -0300 Subject: [PATCH] --- yaml --- r: 250343 b: refs/heads/master c: 612031c0771def54dd202cef76bb9bd654e47b5b h: refs/heads/master i: 250341: e345830f2ab2f8670e152e167c5f9fae0d5726f6 250339: d14c797c0e6a78023a5f470f7c88680fc44fb7ce 250335: 3ba2a2f32e35a977983fc522743cc36439ae97b1 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx18/cx18-fileops.c | 3 --- trunk/drivers/media/video/cx18/cx18-streams.c | 2 ++ 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 05ad9501946d..df7340f246f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9c417b5a462d9d0392d91bb73d9a1a16bb2959a +refs/heads/master: 612031c0771def54dd202cef76bb9bd654e47b5b diff --git a/trunk/drivers/media/video/cx18/cx18-fileops.c b/trunk/drivers/media/video/cx18/cx18-fileops.c index 6609222eccf8..07411f34885a 100644 --- a/trunk/drivers/media/video/cx18/cx18-fileops.c +++ b/trunk/drivers/media/video/cx18/cx18-fileops.c @@ -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; diff --git a/trunk/drivers/media/video/cx18/cx18-streams.c b/trunk/drivers/media/video/cx18/cx18-streams.c index 3995af71b820..852f420fd271 100644 --- a/trunk/drivers/media/video/cx18/cx18-streams.c +++ b/trunk/drivers/media/video/cx18/cx18-streams.c @@ -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,