From 8e313f6ee349b44a3bfc21e589305649b7eecac5 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 21 Oct 2010 16:21:45 -0300 Subject: [PATCH] --- yaml --- r: 219494 b: refs/heads/master c: 5401c2db1ee0adc89dfb5d4b1a6dc1f2efe38854 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx88/cx88-video.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e8fc54000087..f873fbe0362f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8298f2f810b988dccfa0ab51cd874e107514c036 +refs/heads/master: 5401c2db1ee0adc89dfb5d4b1a6dc1f2efe38854 diff --git a/trunk/drivers/media/video/cx88/cx88-video.c b/trunk/drivers/media/video/cx88/cx88-video.c index 19c64a7d0985..c19ec71abc03 100644 --- a/trunk/drivers/media/video/cx88/cx88-video.c +++ b/trunk/drivers/media/video/cx88/cx88-video.c @@ -752,7 +752,7 @@ static int video_open(struct file *file) { struct video_device *vdev = video_devdata(file); struct cx8800_dev *dev = video_drvdata(file); - struct cx88_core *core; + struct cx88_core *core = dev->core; struct cx8800_fh *fh; enum v4l2_buf_type type = 0; int radio = 0; @@ -786,7 +786,6 @@ static int video_open(struct file *file) fh->fmt = format_by_fourcc(V4L2_PIX_FMT_BGR24); mutex_lock(&core->lock); - core = dev->core; videobuf_queue_sg_init(&fh->vidq, &cx8800_video_qops, &dev->pci->dev, &dev->slock,