summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSakari Ailus2012-05-25 12:08:05 +0200
committerMauro Carvalho Chehab2012-06-25 14:23:21 +0200
commita60a295986edcbca6603cd42b4e38d7c83d87fb6 (patch)
tree95bef93bd6bfee56b39af679a7db43271d21a22f
parent[media] s5p-fimc: Update to the control handler lock changes (diff)
downloadkernel-qcow2-linux-a60a295986edcbca6603cd42b4e38d7c83d87fb6.tar.gz
kernel-qcow2-linux-a60a295986edcbca6603cd42b4e38d7c83d87fb6.tar.xz
kernel-qcow2-linux-a60a295986edcbca6603cd42b4e38d7c83d87fb6.zip
[media] s5p-fimc: media_entity_pipeline_start() may fail
Take into account media_entity_pipeline_start() may fail. [s.nawrocki: rebased onto latest tree] Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/s5p-fimc/fimc-capture.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c
index 71e483847a17..7ace324d30cd 100644
--- a/drivers/media/video/s5p-fimc/fimc-capture.c
+++ b/drivers/media/video/s5p-fimc/fimc-capture.c
@@ -1045,8 +1045,10 @@ static int fimc_cap_streamon(struct file *file, void *priv,
if (fimc_capture_active(fimc))
return -EBUSY;
- media_entity_pipeline_start(&p->subdevs[IDX_SENSOR]->entity,
+ ret = media_entity_pipeline_start(&p->subdevs[IDX_SENSOR]->entity,
p->m_pipeline);
+ if (ret < 0)
+ return ret;
if (fimc->vid_cap.user_subdev_api) {
ret = fimc_pipeline_validate(fimc);