aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2012-05-25 06:08:05 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-06-25 08:23:21 -0400
commita60a295986edcbca6603cd42b4e38d7c83d87fb6 (patch)
tree95bef93bd6bfee56b39af679a7db43271d21a22f /drivers
parent8183e7a7e2a4b542bd3044c5e3b0e116b0a7d2a1 (diff)
[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>
Diffstat (limited to 'drivers')
-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,
1045 if (fimc_capture_active(fimc)) 1045 if (fimc_capture_active(fimc))
1046 return -EBUSY; 1046 return -EBUSY;
1047 1047
1048 media_entity_pipeline_start(&p->subdevs[IDX_SENSOR]->entity, 1048 ret = media_entity_pipeline_start(&p->subdevs[IDX_SENSOR]->entity,
1049 p->m_pipeline); 1049 p->m_pipeline);
1050 if (ret < 0)
1051 return ret;
1050 1052
1051 if (fimc->vid_cap.user_subdev_api) { 1053 if (fimc->vid_cap.user_subdev_api) {
1052 ret = fimc_pipeline_validate(fimc); 1054 ret = fimc_pipeline_validate(fimc);