From 483d8886d150fbc2c6f5854058f5edaa78c92780 Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Thu, 22 Nov 2012 11:12:16 -0300 Subject: [PATCH] --- yaml --- r: 336203 b: refs/heads/master c: ba6b372cf0af564bdc6c14bf68e078ae34bef222 h: refs/heads/master i: 336201: 8d65b20511995cde8ba6d4fadf97d52cc03d8d43 336199: 904c3093c5b76a7dae1e535e4822cea40fb48312 v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/s5p-fimc/fimc-capture.c | 3 +-- trunk/drivers/media/platform/s5p-fimc/fimc-m2m.c | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2586a46c156b..ec5af2f3530a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97d66c47277fc801bc1ee93559a848057181ea55 +refs/heads/master: ba6b372cf0af564bdc6c14bf68e078ae34bef222 diff --git a/trunk/drivers/media/platform/s5p-fimc/fimc-capture.c b/trunk/drivers/media/platform/s5p-fimc/fimc-capture.c index 3fc896b8eeae..891ee873c62b 100644 --- a/trunk/drivers/media/platform/s5p-fimc/fimc-capture.c +++ b/trunk/drivers/media/platform/s5p-fimc/fimc-capture.c @@ -556,8 +556,7 @@ static int fimc_capture_close(struct file *file) dbg("pid: %d, state: 0x%lx", task_pid_nr(current), fimc->state); - if (mutex_lock_interruptible(&fimc->lock)) - return -ERESTARTSYS; + mutex_lock(&fimc->lock); if (--fimc->vid_cap.refcnt == 0) { clear_bit(ST_CAPT_BUSY, &fimc->state); diff --git a/trunk/drivers/media/platform/s5p-fimc/fimc-m2m.c b/trunk/drivers/media/platform/s5p-fimc/fimc-m2m.c index 4500e44f6857..62afed3162ea 100644 --- a/trunk/drivers/media/platform/s5p-fimc/fimc-m2m.c +++ b/trunk/drivers/media/platform/s5p-fimc/fimc-m2m.c @@ -718,8 +718,7 @@ static int fimc_m2m_release(struct file *file) dbg("pid: %d, state: 0x%lx, refcnt= %d", task_pid_nr(current), fimc->state, fimc->m2m.refcnt); - if (mutex_lock_interruptible(&fimc->lock)) - return -ERESTARTSYS; + mutex_lock(&fimc->lock); v4l2_m2m_ctx_release(ctx->m2m_ctx); fimc_ctrls_delete(ctx);