From patchwork Thu Nov 22 20:49:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 15567 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1Tbdiz-0005I1-6Y for patchwork@linuxtv.org; Thu, 22 Nov 2012 21:50:17 +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-2) with esmtp for id 1Tbdiy-00052o-Hh; Thu, 22 Nov 2012 21:50:17 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932267Ab2KVUty (ORCPT ); Thu, 22 Nov 2012 15:49:54 -0500 Received: from mail-ee0-f46.google.com ([74.125.83.46]:53939 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757525Ab2KVUtv (ORCPT ); Thu, 22 Nov 2012 15:49:51 -0500 Received: by mail-ee0-f46.google.com with SMTP id e53so3087367eek.19 for ; Thu, 22 Nov 2012 12:49:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=KMkPqJ1N8rEjgh+BJ8KoKGvvVHykKFWhseuLEMWHjUQ=; b=brsEWroPleWsryTPiZ42sXhJi0Xm7QEfJPVdni+HDWWYGx61WlmGUAgQYUii4dqWpa ZlSdCxSjNU1C08aIfxPUCcv5RWsCFUDxojgTiwmK2I6HzI4PRV02Xylp4NdJ1MBmlhZ3 E31sjtQr0LA3nna+kIDO6+mCOIv+9Sm3AUwUBfmAAvlbgEE7064B20uzkXfWlASzL/WS gldVcMbrhHbVxum3UVFU9iKhO1TiCXhuxMqxEGTA5SY2eH3QqGgbGPvTfGVCBopM29Lu U7X3W1uEf7Hi47Jsr+jXqVZ1ytpCHnODQfCFTw/0N3G3pR40OvLvMxFMw+920YyrlfZd UAsg== Received: by 10.14.176.68 with SMTP id a44mr5383237eem.1.1353617390227; Thu, 22 Nov 2012 12:49:50 -0800 (PST) Received: from [192.168.1.110] (178235118103.warszawa.vectranet.pl. [178.235.118.103]) by mx.google.com with ESMTPS id o47sm9203105eem.11.2012.11.22.12.49.48 (version=SSLv3 cipher=OTHER); Thu, 22 Nov 2012 12:49:49 -0800 (PST) Message-ID: <50AE8FEA.1060509@gmail.com> Date: Thu, 22 Nov 2012 21:49:46 +0100 From: Sylwester Nawrocki User-Agent: Mozilla/5.0 (X11; Linux i686; rv:11.0) Gecko/20120412 Thunderbird/11.0.1 MIME-Version: 1.0 To: LMML CC: Sylwester Nawrocki Subject: Re: [GIT PULL FOR 3.8] V4L2 driver for S3C24XX/S3C64XX SoC series camera interface References: <50AD4845.5080209@gmail.com> In-Reply-To: <50AD4845.5080209@gmail.com> 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: 2012.11.22.203923 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' FORGED_FROM_GMAIL 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_3000_3999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __BOUNCE_CHALLENGE_SUBJ 0, __BOUNCE_NDR_SUBJ_EXEMPT 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MOZILLA_MSGID 0, __MOZILLA_USER_AGENT 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS , __USER_AGENT 0, __YOUTUBE_RCVD 0' Hi Mauro, On 11/21/2012 10:31 PM, Sylwester Nawrocki wrote: > The following changes since commit > 2c4e11b7c15af70580625657a154ea7ea70b8c76: > > [media] siano: fix RC compilation (2012-11-07 11:09:08 +0100) > > are available in the git repository at: > git://linuxtv.org/snawrocki/media.git mainline/s3c-camif I've found a bug and have updated this branch: The following changes since commit 2c4e11b7c15af70580625657a154ea7ea70b8c76: [media] siano: fix RC compilation (2012-11-07 11:09:08 +0100) are available in the git repository at: git://linuxtv.org/snawrocki/media.git mainline/s3c-camif Sylwester Nawrocki (2): V4L: Add driver for S3C24XX/S3C64XX SoC series camera interface MAINTAINERS: Add entry for S3C24XX/S3C64XX SoC CAMIF driver MAINTAINERS | 8 + drivers/media/platform/Kconfig | 12 + drivers/media/platform/Makefile | 1 + drivers/media/platform/s3c-camif/Makefile | 5 + drivers/media/platform/s3c-camif/camif-capture.c | 1672 ++++++++++++++++++++++ drivers/media/platform/s3c-camif/camif-core.c | 662 +++++++++ drivers/media/platform/s3c-camif/camif-core.h | 393 +++++ drivers/media/platform/s3c-camif/camif-regs.c | 606 ++++++++ drivers/media/platform/s3c-camif/camif-regs.h | 269 ++++ include/media/s3c_camif.h | 45 + 10 files changed, 3673 insertions(+), 0 deletions(-) create mode 100644 drivers/media/platform/s3c-camif/Makefile create mode 100644 drivers/media/platform/s3c-camif/camif-capture.c create mode 100644 drivers/media/platform/s3c-camif/camif-core.c create mode 100644 drivers/media/platform/s3c-camif/camif-core.h create mode 100644 drivers/media/platform/s3c-camif/camif-regs.c create mode 100644 drivers/media/platform/s3c-camif/camif-regs.h create mode 100644 include/media/s3c_camif.h And here is the diff: --- Thanks, Sylwester -- 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/platform/s3c-camif/camif-capture.c b/drivers/media/platform/s3c-camif/camif-capture.c index ef0b0ed..0812e2e 100644 --- a/drivers/media/platform/s3c-camif/camif-capture.c +++ b/drivers/media/platform/s3c-camif/camif-capture.c @@ -599,8 +599,7 @@ static int s3c_camif_close(struct file *file) pr_debug("[vp%d] state: %#x, owner: %p, pid: %d\n", vp->id, vp->state, vp->owner, task_pid_nr(current)); - if (mutex_lock_interruptible(&camif->lock)) - return -ERESTARTSYS; + mutex_lock(&camif->lock); if (vp->owner == file->private_data) { camif_stop_capture(vp); @@ -624,9 +623,7 @@ static unsigned int s3c_camif_poll(struct file *file, struct camif_dev *camif = vp->camif; int ret; - if (mutex_lock_interruptible(&camif->lock)) - return -ERESTARTSYS; - + mutex_lock(&camif->lock); if (vp->owner && vp->owner != file->private_data) ret = -EBUSY; else