From c4ed762d433badc4124264bf5605c3774fc96b96 Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Wed, 21 Nov 2012 11:46:43 -0300 Subject: [PATCH] --- yaml --- r: 336205 b: refs/heads/master c: 9868018045c555c7a724c0cb7eeb0caeba9d43ff h: refs/heads/master i: 336203: 483d8886d150fbc2c6f5854058f5edaa78c92780 v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/exynos-gsc/gsc-m2m.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 38c4710d796d..2df0653f0687 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ddc43d6dc7df0849fe41b91460fa76145cf87b67 +refs/heads/master: 9868018045c555c7a724c0cb7eeb0caeba9d43ff diff --git a/trunk/drivers/media/platform/exynos-gsc/gsc-m2m.c b/trunk/drivers/media/platform/exynos-gsc/gsc-m2m.c index 3c7f00577bd9..2650be3ccd5a 100644 --- a/trunk/drivers/media/platform/exynos-gsc/gsc-m2m.c +++ b/trunk/drivers/media/platform/exynos-gsc/gsc-m2m.c @@ -657,8 +657,7 @@ static int gsc_m2m_release(struct file *file) pr_debug("pid: %d, state: 0x%lx, refcnt= %d", task_pid_nr(current), gsc->state, gsc->m2m.refcnt); - if (mutex_lock_interruptible(&gsc->lock)) - return -ERESTARTSYS; + mutex_lock(&gsc->lock); v4l2_m2m_ctx_release(ctx->m2m_ctx); gsc_ctrls_delete(ctx);