From 22f14367c75a1b70a7717a49e73ed08a2e66786b Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Thu, 22 Nov 2012 11:13:04 -0300 Subject: [PATCH] --- yaml --- r: 336204 b: refs/heads/master c: ddc43d6dc7df0849fe41b91460fa76145cf87b67 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/s5p-fimc/fimc-lite.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ec5af2f3530a..38c4710d796d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba6b372cf0af564bdc6c14bf68e078ae34bef222 +refs/heads/master: ddc43d6dc7df0849fe41b91460fa76145cf87b67 diff --git a/trunk/drivers/media/platform/s5p-fimc/fimc-lite.c b/trunk/drivers/media/platform/s5p-fimc/fimc-lite.c index 23f203e8a7d3..1b309a72f09f 100644 --- a/trunk/drivers/media/platform/s5p-fimc/fimc-lite.c +++ b/trunk/drivers/media/platform/s5p-fimc/fimc-lite.c @@ -491,8 +491,7 @@ static int fimc_lite_close(struct file *file) struct fimc_lite *fimc = video_drvdata(file); int ret; - if (mutex_lock_interruptible(&fimc->lock)) - return -ERESTARTSYS; + mutex_lock(&fimc->lock); if (--fimc->ref_count == 0 && fimc->out_path == FIMC_IO_DMA) { clear_bit(ST_FLITE_IN_USE, &fimc->state);