* [PATCH] [media] media: davinci_vpfe: fix missing unlock on error in vpfe_prepare_pipeline()
@ 2016-02-05 13:52 weiyj_lk
2016-02-07 18:07 ` Sakari Ailus
0 siblings, 1 reply; 2+ messages in thread
From: weiyj_lk @ 2016-02-05 13:52 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Greg Kroah-Hartman, Lad, Prabhakar,
Javier Martinez Canillas, Sakari Ailus, Hans Verkuil, Inki Dae,
Geunyoung Kim, Junghak Sung
Cc: Wei Yongjun, linux-media, devel
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Add the missing unlock before return from function
vpfe_prepare_pipeline() in the error handling case.
video->lock is lock/unlock in function vpfe_open(),
and no need to unlock it here, so remove unlock
video->lock.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
drivers/staging/media/davinci_vpfe/vpfe_video.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c
index 3ec7e65..db49af9 100644
--- a/drivers/staging/media/davinci_vpfe/vpfe_video.c
+++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c
@@ -147,7 +147,7 @@ static int vpfe_prepare_pipeline(struct vpfe_video_device *video)
mutex_lock(&mdev->graph_mutex);
ret = media_entity_graph_walk_init(&graph, entity->graph_obj.mdev);
if (ret) {
- mutex_unlock(&video->lock);
+ mutex_unlock(&mdev->graph_mutex);
return -ENOMEM;
}
media_entity_graph_walk_start(&graph, entity);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] [media] media: davinci_vpfe: fix missing unlock on error in vpfe_prepare_pipeline()
2016-02-05 13:52 [PATCH] [media] media: davinci_vpfe: fix missing unlock on error in vpfe_prepare_pipeline() weiyj_lk
@ 2016-02-07 18:07 ` Sakari Ailus
0 siblings, 0 replies; 2+ messages in thread
From: Sakari Ailus @ 2016-02-07 18:07 UTC (permalink / raw)
To: weiyj_lk
Cc: Mauro Carvalho Chehab, Greg Kroah-Hartman, Lad, Prabhakar,
Javier Martinez Canillas, Hans Verkuil, Inki Dae, Geunyoung Kim,
Junghak Sung, Wei Yongjun, linux-media, devel
Hi Wei,
On Fri, Feb 05, 2016 at 09:52:00PM +0800, weiyj_lk@163.com wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> Add the missing unlock before return from function
> vpfe_prepare_pipeline() in the error handling case.
>
> video->lock is lock/unlock in function vpfe_open(),
> and no need to unlock it here, so remove unlock
> video->lock.
>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> ---
> drivers/staging/media/davinci_vpfe/vpfe_video.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c
> index 3ec7e65..db49af9 100644
> --- a/drivers/staging/media/davinci_vpfe/vpfe_video.c
> +++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c
> @@ -147,7 +147,7 @@ static int vpfe_prepare_pipeline(struct vpfe_video_device *video)
> mutex_lock(&mdev->graph_mutex);
> ret = media_entity_graph_walk_init(&graph, entity->graph_obj.mdev);
> if (ret) {
> - mutex_unlock(&video->lock);
> + mutex_unlock(&mdev->graph_mutex);
Oh dear. I wonder how could this have happened... thanks for the fix!
I've applied this to my tree.
> return -ENOMEM;
> }
> media_entity_graph_walk_start(&graph, entity);
>
--
Kind regards,
Sakari Ailus
e-mail: sakari.ailus@iki.fi XMPP: sailus@retiisi.org.uk
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-02-07 18:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-05 13:52 [PATCH] [media] media: davinci_vpfe: fix missing unlock on error in vpfe_prepare_pipeline() weiyj_lk
2016-02-07 18:07 ` Sakari Ailus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).