From patchwork Thu Dec 13 13:59:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [221/241, media] fimc-lite: Don't use mutex_lock_interruptible() in device release() From: Herton Ronaldo Krzesinski X-Patchwork-Id: 206066 Message-Id: <1355407206-17100-222-git-send-email-herton.krzesinski@canonical.com> To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Kyungmin Park , Mauro Carvalho Chehab , Sylwester Nawrocki Date: Thu, 13 Dec 2012 11:59:46 -0200 3.5.7.2 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Sylwester Nawrocki commit ddc43d6dc7df0849fe41b91460fa76145cf87b67 upstream. Use uninterruptible mutex_lock in the release() file op to make sure all resources are properly freed when a process is being terminated. Returning -ERESTARTSYS has no effect for a terminating process and this may cause driver resources not to be released. This patch is required for stable kernels v3.5+. Reported-by: Marek Szyprowski Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab [ herton: adjust file name to patch ] Signed-off-by: Herton Ronaldo Krzesinski --- drivers/media/video/s5p-fimc/fimc-lite.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/media/video/s5p-fimc/fimc-lite.c b/drivers/media/video/s5p-fimc/fimc-lite.c index 74ff310..9132f61 100644 --- a/drivers/media/video/s5p-fimc/fimc-lite.c +++ b/drivers/media/video/s5p-fimc/fimc-lite.c @@ -487,8 +487,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);