[PATCH 1/3] [media] s5p-fimc: Fix compiler warning in fimc-lite.c

[PATCH 1/3] [media] s5p-fimc: Fix compiler warning in fimc-lite.c

[Sachin Kamat]

Fixes the followng warning:
drivers/media/video/s5p-fimc/fimc-lite.c: In function ‘fimc_lite_streamon’:
drivers/media/video/s5p-fimc/fimc-lite.c:765:29: warning: ignoring return value
of ‘media_entity_pipeline_start’, declared with attribute warn_unused_result [-Wunused-result]

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/media/video/s5p-fimc/fimc-lite.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/media/video/s5p-fimc/fimc-lite.c b/drivers/media/video/s5p-fimc/fimc-lite.c
index 400d701a..62faca5 100644
--- a/drivers/media/video/s5p-fimc/fimc-lite.c
+++ b/drivers/media/video/s5p-fimc/fimc-lite.c
@@ -762,7 +762,9 @@ static int fimc_lite_streamon(struct file *file, void *priv,
 	if (fimc_lite_active(fimc))
 		return -EBUSY;
 
-	media_entity_pipeline_start(&sensor->entity, p->m_pipeline);
+	ret = media_entity_pipeline_start(&sensor->entity, p->m_pipeline);
+	if (ret)
+		return ret;
 
 	ret = fimc_pipeline_validate(fimc);
 	if (ret) {
-- 
1.7.4.1

[PATCH 2/3] [media] s5p-fimc: Fix compiler warning in fimc-capture.c file

[Sachin Kamat]

drivers/media/video/s5p-fimc/fimc-capture.c: In function ‘fimc_cap_streamon’:
drivers/media/video/s5p-fimc/fimc-capture.c:1053:29: warning: ignoring return
value of ‘media_entity_pipeline_start’, declared with attribute warn_unused_result [-Wunused-result]

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/media/video/s5p-fimc/fimc-capture.c |    4 +++-
 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 3545745..587d087 100644
--- a/drivers/media/video/s5p-fimc/fimc-capture.c
+++ b/drivers/media/video/s5p-fimc/fimc-capture.c
@@ -1050,8 +1050,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)
+		return ret;
 
 	if (fimc->vid_cap.user_subdev_api) {
 		ret = fimc_pipeline_validate(fimc);
-- 
1.7.4.1

Re: [PATCH 2/3] [media] s5p-fimc: Fix compiler warning in fimc-capture.c file

[Sylwester Nawrocki]

Hi Sachin,

On 05/25/2012 08:29 AM, Sachin Kamat wrote:
> drivers/media/video/s5p-fimc/fimc-capture.c: In function ‘fimc_cap_streamon’:
> drivers/media/video/s5p-fimc/fimc-capture.c:1053:29: warning: ignoring return
> value of ‘media_entity_pipeline_start’, declared with attribute warn_unused_result [-Wunused-result]
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>

Thanks for the patch. Sakari submitted a similar one
(http://patchwork.linuxtv.org/patch/10799) so I'd like to
apply that instead.

Regards,
Sylwester

Re: [PATCH 2/3] [media] s5p-fimc: Fix compiler warning in fimc-capture.c file

[Sylwester Nawrocki]

On 05/25/2012 08:29 AM, Sachin Kamat wrote:
> drivers/media/video/s5p-fimc/fimc-capture.c: In function ‘fimc_cap_streamon’:
> drivers/media/video/s5p-fimc/fimc-capture.c:1053:29: warning: ignoring return
> value of ‘media_entity_pipeline_start’, declared with attribute warn_unused_result [-Wunused-result]
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>

Thanks, I've applied that one, with slightly extended commit message.

Regards,
Sylwester

[PATCH 3/3] [media] s5p-fimc: Stop media entity pipeline if fimc_pipeline_validate fails

[Sachin Kamat]

Stops the media entity pipeline which was started earlier
if fimc_pipeline_validate fails.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/media/video/s5p-fimc/fimc-capture.c |    4 +++-
 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 587d087..d9efa64 100644
--- a/drivers/media/video/s5p-fimc/fimc-capture.c
+++ b/drivers/media/video/s5p-fimc/fimc-capture.c
@@ -1057,8 +1057,10 @@ static int fimc_cap_streamon(struct file *file, void *priv,
 
 	if (fimc->vid_cap.user_subdev_api) {
 		ret = fimc_pipeline_validate(fimc);
-		if (ret)
+		if (ret) {
+			media_entity_pipeline_stop(&p->subdevs[IDX_SENSOR]->entity);
 			return ret;
+		}
 	}
 	return vb2_streamon(&fimc->vid_cap.vbq, type);
 }
-- 
1.7.4.1

Re: [PATCH 3/3] [media] s5p-fimc: Stop media entity pipeline if fimc_pipeline_validate fails

[Sylwester Nawrocki]

On 05/25/2012 08:29 AM, Sachin Kamat wrote:
> Stops the media entity pipeline which was started earlier
> if fimc_pipeline_validate fails.
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>

Applied that one too. Thanks.

--
Regards,
Sylwester