RE: [patch] V4L/DVB: unlock on error path

2010-08-19 Thread Sylwester Nawrocki
Thank you for catching this up. I had this fixed already, but due to hassle
caused by having multiple versions of the driver this bug somehow made it
unnoticed to mainline.

Acked-by: Sylwester Nawrocki s.nawro...@samsung.com

 -Original Message-
 From: Dan Carpenter [mailto:erro...@gmail.com]
 Sent: Thursday, August 12, 2010 9:42 AM
 To: Mauro Carvalho Chehab
 Cc: Pawel Osciak; Kyungmin Park; Sylwester Nawrocki; linux-
 me...@vger.kernel.org; kernel-janit...@vger.kernel.org
 Subject: [patch] V4L/DVB: unlock on error path
 
 If we return directly here then we miss out on some mutex_unlock()s
 
 Signed-off-by: Dan Carpenter erro...@gmail.com
 
 diff --git a/drivers/media/video/s5p-fimc/fimc-core.c
 b/drivers/media/video/s5p-fimc/fimc-core.c
 index b151c7b..1beb226 100644
 --- a/drivers/media/video/s5p-fimc/fimc-core.c
 +++ b/drivers/media/video/s5p-fimc/fimc-core.c
 @@ -822,7 +822,8 @@ static int fimc_m2m_s_fmt(struct file *file, void
 *priv, struct v4l2_format *f)
   } else {
   v4l2_err(ctx-fimc_dev-m2m.v4l2_dev,
Wrong buffer/video queue type (%d)\n, f-type);
 - return -EINVAL;
 + ret = -EINVAL;
 + goto s_fmt_out;
   }
 
   pix = f-fmt.pix;


--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[patch] V4L/DVB: unlock on error path

2010-08-12 Thread Dan Carpenter
If we return directly here then we miss out on some mutex_unlock()s

Signed-off-by: Dan Carpenter erro...@gmail.com

diff --git a/drivers/media/video/s5p-fimc/fimc-core.c 
b/drivers/media/video/s5p-fimc/fimc-core.c
index b151c7b..1beb226 100644
--- a/drivers/media/video/s5p-fimc/fimc-core.c
+++ b/drivers/media/video/s5p-fimc/fimc-core.c
@@ -822,7 +822,8 @@ static int fimc_m2m_s_fmt(struct file *file, void *priv, 
struct v4l2_format *f)
} else {
v4l2_err(ctx-fimc_dev-m2m.v4l2_dev,
 Wrong buffer/video queue type (%d)\n, f-type);
-   return -EINVAL;
+   ret = -EINVAL;
+   goto s_fmt_out;
}
 
pix = f-fmt.pix;
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html