From patchwork Sun May 31 06:32:18 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Figo.zhang" X-Patchwork-Id: 27098 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n4V6WTE7022914 for ; Sun, 31 May 2009 06:32:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751494AbZEaGcZ (ORCPT ); Sun, 31 May 2009 02:32:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752186AbZEaGcZ (ORCPT ); Sun, 31 May 2009 02:32:25 -0400 Received: from mail-px0-f191.google.com ([209.85.216.191]:44500 "EHLO mail-px0-f191.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751494AbZEaGcY (ORCPT ); Sun, 31 May 2009 02:32:24 -0400 Received: by pxi29 with SMTP id 29so2207998pxi.33 for ; Sat, 30 May 2009 23:32:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=0cVo5haGpGTThBK+PGnC2DeO7aM1sYt6LRwu6szlh/I=; b=iWK5q+tTKI7ZEIA8da9XI7R7/YycfW9JoSEVMYMhkg40xuHfhU0XuKlOx4wjT9fk1g 0smpXtKXK9OxWsmJUI4FXoJpteX18g07ArPEXtlgaskllIGmD9ozmlKWhccOsyOKJQzi RQUEr/bzDUSP08VaILwtga0NkS1n/WF8OG9eQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=oh1aj+RPfjxBg/fVesXYQzf1gbgXnR4q/ookI0k/DQJYWAKWXr42RkNw+yrJKk6G4c uxRLl977XX7WibB/r6UfHE6qQ8hdTrjpX0HuUkypOPhPhlkvhm5SHPZ0Xe5czYa82ds8 l+/IrNraXlHayI6PHl988+SAAvhuL9d+fkPXI= Received: by 10.142.238.20 with SMTP id l20mr1490176wfh.169.1243751546371; Sat, 30 May 2009 23:32:26 -0700 (PDT) Received: from ?172.16.3.7? ([116.228.155.46]) by mx.google.com with ESMTPS id 22sm7308020wfi.32.2009.05.30.23.32.22 (version=SSLv3 cipher=RC4-MD5); Sat, 30 May 2009 23:32:25 -0700 (PDT) Subject: [PATCH] bttv-driver.c :poll method lose race condition for capture video From: "Figo.zhang" To: Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, kraxel@bytesex.org, Hans Verkuil , =?UTF-8?Q?Old=C5=99ich_Jedli=C4=8Dka?= Date: Sun, 31 May 2009 14:32:18 +0800 Message-Id: <1243751538.3425.6.camel@myhost> Mime-Version: 1.0 X-Mailer: Evolution 2.26.2 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org bttv-driver.c,cx23885-video.c,cx88-video.c: poll method lose race condition for capture video. Signed-off-by: Figo.zhang --- drivers/media/video/bt8xx/bttv-driver.c | 7 +++++-- drivers/media/video/cx23885/cx23885-video.c | 15 +++++++++++---- drivers/media/video/cx88/cx88-video.c | 13 ++++++++++--- 3 files changed, 26 insertions(+), 9 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c index 23b7499..9cadfcc 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c @@ -3152,6 +3152,7 @@ static unsigned int bttv_poll(struct file *file, poll_table *wait) struct bttv_fh *fh = file->private_data; struct bttv_buffer *buf; enum v4l2_field field; + unsigned int rc = 0; if (V4L2_BUF_TYPE_VBI_CAPTURE == fh->type) { if (!check_alloc_btres(fh->btv,fh,RESOURCE_VBI)) @@ -3160,6 +3161,7 @@ static unsigned int bttv_poll(struct file *file, poll_table *wait) } if (check_btres(fh,RESOURCE_VIDEO_STREAM)) { + mutex_lock(&fh->cap.vb_lock); /* streaming capture */ if (list_empty(&fh->cap.stream)) return POLLERR; @@ -3191,8 +3193,9 @@ static unsigned int bttv_poll(struct file *file, poll_table *wait) poll_wait(file, &buf->vb.done, wait); if (buf->vb.state == VIDEOBUF_DONE || buf->vb.state == VIDEOBUF_ERROR) - return POLLIN|POLLRDNORM; - return 0; + rc = POLLIN|POLLRDNORM; + mutex_unlock(&fh->cap.vb_lock); + return rc; err: mutex_unlock(&fh->cap.vb_lock); return POLLERR; diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c index 68068c6..386ad86 100644 --- a/drivers/media/video/cx23885/cx23885-video.c +++ b/drivers/media/video/cx23885/cx23885-video.c @@ -796,6 +796,7 @@ static unsigned int video_poll(struct file *file, { struct cx23885_fh *fh = file->private_data; struct cx23885_buffer *buf; + unsigned int rc = 0; if (V4L2_BUF_TYPE_VBI_CAPTURE == fh->type) { if (!res_get(fh->dev, fh, RESOURCE_VBI)) @@ -803,23 +804,29 @@ static unsigned int video_poll(struct file *file, return videobuf_poll_stream(file, &fh->vbiq, wait); } + mutex_lock(&fh->vidq.vb_lock); if (res_check(fh, RESOURCE_VIDEO)) { /* streaming capture */ if (list_empty(&fh->vidq.stream)) - return POLLERR; + goto err; buf = list_entry(fh->vidq.stream.next, struct cx23885_buffer, vb.stream); } else { /* read() capture */ buf = (struct cx23885_buffer *)fh->vidq.read_buf; if (NULL == buf) - return POLLERR; + goto err; } poll_wait(file, &buf->vb.done, wait); if (buf->vb.state == VIDEOBUF_DONE || buf->vb.state == VIDEOBUF_ERROR) - return POLLIN|POLLRDNORM; - return 0; + rc = POLLIN|POLLRDNORM; + mutex_unlock(&fh->vidq.vb_lock); + return rc; + +err: + mutex_unlock(&fh->vidq.vb_lock); + return POLLERR; } static int video_release(struct file *file) diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index b993d42..f778d15 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c @@ -869,6 +869,7 @@ video_poll(struct file *file, struct poll_table_struct *wait) { struct cx8800_fh *fh = file->private_data; struct cx88_buffer *buf; + unsigned int rc = 0; if (V4L2_BUF_TYPE_VBI_CAPTURE == fh->type) { if (!res_get(fh->dev,fh,RESOURCE_VBI)) @@ -876,22 +877,28 @@ video_poll(struct file *file, struct poll_table_struct *wait) return videobuf_poll_stream(file, &fh->vbiq, wait); } + mutex_lock(&fh->vidq.vb_lock); if (res_check(fh,RESOURCE_VIDEO)) { /* streaming capture */ if (list_empty(&fh->vidq.stream)) - return POLLERR; + goto err; buf = list_entry(fh->vidq.stream.next,struct cx88_buffer,vb.stream); } else { /* read() capture */ buf = (struct cx88_buffer*)fh->vidq.read_buf; if (NULL == buf) - return POLLERR; + goto err; } poll_wait(file, &buf->vb.done, wait); if (buf->vb.state == VIDEOBUF_DONE || buf->vb.state == VIDEOBUF_ERROR) - return POLLIN|POLLRDNORM; + rc = POLLIN|POLLRDNORM; + mutex_unlock(&fh->vidq.vb_lock); return 0; + +err: + mutex_unlock(&fh->vidq.vb_lock); + return POLLERR; } static int video_release(struct file *file)