1 files changed, 17 insertions, 10 deletions

diff --git a/drivers/media/video/omap3isp/ispvideo.c b/drivers/media/video/omap3isp/ispvideo.c
index bd3aebafafa0..b02070057724 100644
--- a/drivers/media/video/omap3isp/ispvideo.c
+++ b/drivers/media/video/omap3isp/ispvideo.c
@@ -211,14 +211,14 @@ static void isp_video_pix_to_mbus(const struct v4l2_pix_format *pix,
         mbus->width = pix->width;
         mbus->height = pix->height;
 
-        for (i = 0; i < ARRAY_SIZE(formats); ++i) {
+        /* Skip the last format in the loop so that it will be selected if no
+         * match is found.
+         */
+        for (i = 0; i < ARRAY_SIZE(formats) - 1; ++i) {
                 if (formats[i].pixelformat == pix->pixelformat)
                         break;
         }
 
-        if (WARN_ON(i == ARRAY_SIZE(formats)))
-                return;
-
         mbus->code = formats[i].code;
         mbus->colorspace = pix->colorspace;
         mbus->field = pix->field;
@@ -581,21 +581,20 @@ static const struct isp_video_queue_operations isp_video_queue_ops = {
 /*
  * omap3isp_video_buffer_next - Complete the current buffer and return the next
  * @video: ISP video object
- * @error: Whether an error occurred during capture
  *
  * Remove the current video buffer from the DMA queue and fill its timestamp,
  * field count and state fields before waking up its completion handler.
  *
- * The buffer state is set to VIDEOBUF_DONE if no error occurred (@error is 0)
- * or VIDEOBUF_ERROR otherwise (@error is non-zero).
+ * For capture video nodes the buffer state is set to ISP_BUF_STATE_DONE if no
+ * error has been flagged in the pipeline, or to ISP_BUF_STATE_ERROR otherwise.
+ * For video output nodes the buffer state is always set to ISP_BUF_STATE_DONE.
  *
  * The DMA queue is expected to contain at least one buffer.
  *
  * Return a pointer to the next buffer in the DMA queue, or NULL if the queue is
  * empty.
  */
-struct isp_buffer *omap3isp_video_buffer_next(struct isp_video *video,
-                                              unsigned int error)
+struct isp_buffer *omap3isp_video_buffer_next(struct isp_video *video)
 {
         struct isp_pipeline *pipe = to_isp_pipeline(&video->video.entity);
         struct isp_video_queue *queue = video->queue;
@@ -630,7 +629,13 @@ struct isp_buffer *omap3isp_video_buffer_next(struct isp_video *video,
         else
                 buf->vbuf.sequence = atomic_read(&pipe->frame_number);
 
-        buf->state = error ? ISP_BUF_STATE_ERROR : ISP_BUF_STATE_DONE;
+        /* Report pipeline errors to userspace on the capture device side. */
+        if (queue->type == V4L2_BUF_TYPE_VIDEO_CAPTURE && pipe->error) {
+                buf->state = ISP_BUF_STATE_ERROR;
+                pipe->error = false;
+        } else {
+                buf->state = ISP_BUF_STATE_DONE;
+        }
 
         wake_up(&buf->wait);
 
@@ -1016,6 +1021,8 @@ isp_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
         if (ret < 0)
                 goto error;
 
+        pipe->error = false;
+
         spin_lock_irqsave(&pipe->lock, flags);
         pipe->state &= ~ISP_PIPELINE_STREAM;
         pipe->state |= state;