From: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
To: LMML <linux-media@vger.kernel.org>
Cc: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
Subject: Re: [GIT PULL FOR 3.8] V4L2 driver for S3C24XX/S3C64XX SoC series camera interface
Date: Thu, 22 Nov 2012 21:49:46 +0100 [thread overview]
Message-ID: <50AE8FEA.1060509@gmail.com> (raw)
In-Reply-To: <50AD4845.5080209@gmail.com>
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:
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
---
Thanks,
Sylwester
prev parent reply other threads:[~2012-11-22 20:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-21 21:31 [GIT PULL FOR 3.8] V4L2 driver for S3C24XX/S3C64XX SoC series camera interface Sylwester Nawrocki
2012-11-21 21:50 ` [GIT PULL FOR v3.8] [RESEND] " Sylwester Nawrocki
2012-11-22 20:49 ` Sylwester Nawrocki [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50AE8FEA.1060509@gmail.com \
--to=sylvester.nawrocki@gmail.com \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.