[media] omap3isp: Mark next captured frame as faulty when an SBL overflow occurs

Instead of trying to propagate errors down the pipeline manually (and
failing to do so properly in all cases), flag SBL errors in the pipeline
to which the entity that triggered the error belongs, and use pipeline
error flags to mark buffers as faulty when completing them.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 2 insertions, 7 deletions

diff --git a/drivers/media/video/omap3isp/isppreview.c b/drivers/media/video/omap3isp/isppreview.c
index 28a123273a25..6d0fb2c8c26d 100644
--- a/drivers/media/video/omap3isp/isppreview.c
+++ b/drivers/media/video/omap3isp/isppreview.c
@@ -1404,16 +1404,14 @@ static void preview_isr_buffer(struct isp_prev_device *prev)
         int restart = 0;
 
         if (prev->input == PREVIEW_INPUT_MEMORY) {
-                buffer = omap3isp_video_buffer_next(&prev->video_in,
-                                                    prev->error);
+                buffer = omap3isp_video_buffer_next(&prev->video_in);
                 if (buffer != NULL)
                         preview_set_inaddr(prev, buffer->isp_addr);
                 pipe->state |= ISP_PIPELINE_IDLE_INPUT;
         }
 
         if (prev->output & PREVIEW_OUTPUT_MEMORY) {
-                buffer = omap3isp_video_buffer_next(&prev->video_out,
-                                                    prev->error);
+                buffer = omap3isp_video_buffer_next(&prev->video_out);
                 if (buffer != NULL) {
                         preview_set_outaddr(prev, buffer->isp_addr);
                         restart = 1;
@@ -1440,8 +1438,6 @@ static void preview_isr_buffer(struct isp_prev_device *prev)
         default:
                 return;
         }
-
-        prev->error = 0;
 }
 
 /*
@@ -1565,7 +1561,6 @@ static int preview_set_stream(struct v4l2_subdev *sd, int enable)
                 omap3isp_subclk_enable(isp, OMAP3_ISP_SUBCLK_PREVIEW);
                 preview_configure(prev);
                 atomic_set(&prev->stopping, 0);
-                prev->error = 0;
                 preview_print_status(prev);
         }