From patchwork Fri Jan 4 20:59:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 16118 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1TrEND-0007jw-DB; Fri, 04 Jan 2013 22:00:15 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtp id 1TrENC-00054k-Fd; Fri, 04 Jan 2013 22:00:15 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755065Ab3ADVAF (ORCPT + 1 other); Fri, 4 Jan 2013 16:00:05 -0500 Received: from mail-vb0-f42.google.com ([209.85.212.42]:61821 "EHLO mail-vb0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754987Ab3ADVAA (ORCPT ); Fri, 4 Jan 2013 16:00:00 -0500 Received: by mail-vb0-f42.google.com with SMTP id fa15so16981651vbb.15 for ; Fri, 04 Jan 2013 12:59:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=xiIKjIp0twtltTRTfRe8FzZqtixbZpceEb10iq+t760=; b=Ikf7X2hipXdRCr2jG1u6hZOYXNDqhZmnTaai8IR9rgZyZlkGYXm47lB1hWDovg8LGg h5WOdSK54qAKgiL7bd0SYc8kLKjX6OD2DOiTWS2J36KQvFjVmLlMfz3nsPGtgcSAwBoM mDL6gdOU8K1BeK4oOvPG1YsJziNjSKWGE2oEeMHRNsF1dVz1DtnGpRLdpvOWc5/j8pNS 4AUDwO3QP+MrXN+N/tgAY2edEUUri37b4SapT1GKXJlZLW5Q6XukLFoPOWwvrC6I4jkk TwFJ3lMOECtu5wE9RxVZ2PZz/4SL+gAzviLhioVSDolKCpmhbRyGcIdpDU7eVkWF+ss4 9a4g== X-Received: by 10.220.157.9 with SMTP id z9mr77925366vcw.45.1357333199594; Fri, 04 Jan 2013 12:59:59 -0800 (PST) Received: from devin-ubuntu2.home (pool-108-54-72-165.nycmny.fios.verizon.net. [108.54.72.165]) by mx.google.com with ESMTPS id z20sm47278440vds.12.2013.01.04.12.59.58 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 04 Jan 2013 12:59:59 -0800 (PST) From: Devin Heitmueller To: linux-media@vger.kernel.org Cc: Devin Heitmueller , Hans Verkuil Subject: [PATCH 07/15] em28xx: convert to v4l2_fh, fix priority handling. Date: Fri, 4 Jan 2013 15:59:37 -0500 Message-Id: <1357333186-8466-8-git-send-email-dheitmueller@kernellabs.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1357333186-8466-1-git-send-email-dheitmueller@kernellabs.com> References: <1357333186-8466-1-git-send-email-dheitmueller@kernellabs.com> X-Gm-Message-State: ALoCoQn5lBKuBrOGVbqYm37B9zAutHAy/h2GOPAwsDkWzgAI2PjwDLlhGNdEP/st6AYHd1siq/6+ Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2013.1.4.204815 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' Signed-off-by: Hans Verkuil Signed-off-by: Devin Heitmueller --- drivers/media/usb/em28xx/em28xx-video.c | 5 +++++ drivers/media/usb/em28xx/em28xx.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index ebbf775..c67ff8d 100644 --- a/drivers/media/usb/em28xx/em28xx-video.c +++ b/drivers/media/usb/em28xx/em28xx-video.c @@ -1735,6 +1735,7 @@ static int em28xx_v4l2_open(struct file *filp) mutex_unlock(&dev->lock); return -ENOMEM; } + v4l2_fh_init(&fh->fh, vdev); fh->dev = dev; fh->radio = radio; fh->type = fh_type; @@ -1774,6 +1775,7 @@ static int em28xx_v4l2_open(struct file *filp) V4L2_FIELD_SEQ_TB, sizeof(struct em28xx_buffer), fh, &dev->lock); mutex_unlock(&dev->lock); + v4l2_fh_add(&fh->fh); return errCode; } @@ -1867,6 +1869,8 @@ static int em28xx_v4l2_close(struct file *filp) "0 (error=%i)\n", errCode); } } + v4l2_fh_del(&fh->fh); + v4l2_fh_exit(&fh->fh); videobuf_mmap_free(&fh->vb_vidq); videobuf_mmap_free(&fh->vb_vbiq); @@ -2088,6 +2092,7 @@ static struct video_device *em28xx_vdev_init(struct em28xx *dev, vfd->release = video_device_release; vfd->debug = video_debug; vfd->lock = &dev->lock; + set_bit(V4L2_FL_USE_FH_PRIO, &vfd->flags); snprintf(vfd->name, sizeof(vfd->name), "%s %s", dev->name, type_name); diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h index 707319e..7432be4 100644 --- a/drivers/media/usb/em28xx/em28xx.h +++ b/drivers/media/usb/em28xx/em28xx.h @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #if defined(CONFIG_VIDEO_EM28XX_DVB) || defined(CONFIG_VIDEO_EM28XX_DVB_MODULE) @@ -477,6 +478,7 @@ struct em28xx_audio { struct em28xx; struct em28xx_fh { + struct v4l2_fh fh; struct em28xx *dev; int radio; unsigned int resources;