aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2016-02-05 08:52:00 -0500
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-02-10 06:27:09 -0500
commit4f388a9210e2a2c1cd83a5580b74aa13876dbf14 (patch)
tree4c46620aa4a0feeb3aa3b934d557fcf1493a2adc
parentac75fe5d8fe4a0bf063be18fb29684405279e79e (diff)
[media] media: davinci_vpfe: fix missing unlock on error in vpfe_prepare_pipeline()
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> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/staging/media/davinci_vpfe/vpfe_video.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c
index 3ec7e65a3ffa..db49af90217e 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)
147 mutex_lock(&mdev->graph_mutex); 147 mutex_lock(&mdev->graph_mutex);
148 ret = media_entity_graph_walk_init(&graph, entity->graph_obj.mdev); 148 ret = media_entity_graph_walk_init(&graph, entity->graph_obj.mdev);
149 if (ret) { 149 if (ret) {
150 mutex_unlock(&video->lock); 150 mutex_unlock(&mdev->graph_mutex);
151 return -ENOMEM; 151 return -ENOMEM;
152 } 152 }
153 media_entity_graph_walk_start(&graph, entity); 153 media_entity_graph_walk_start(&graph, entity);