1 files changed, 9 insertions, 4 deletions

diff --git a/drivers/media/video/uvc/uvc_queue.c b/drivers/media/video/uvc/uvc_queue.c
index 133c78d113ac..e9928a415086 100644
--- a/drivers/media/video/uvc/uvc_queue.c
+++ b/drivers/media/video/uvc/uvc_queue.c
@@ -78,12 +78,14 @@
  *
  */
 
-void uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type)
+void uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type,
+                    int drop_corrupted)
 {
         mutex_init(&queue->mutex);
         spin_lock_init(&queue->irqlock);
         INIT_LIST_HEAD(&queue->mainqueue);
         INIT_LIST_HEAD(&queue->irqqueue);
+        queue->flags = drop_corrupted ? UVC_QUEUE_DROP_CORRUPTED : 0;
         queue->type = type;
 }
 
@@ -435,8 +437,10 @@ int uvc_queue_enable(struct uvc_video_queue *queue, int enable)
                 uvc_queue_cancel(queue, 0);
                 INIT_LIST_HEAD(&queue->mainqueue);
 
-                for (i = 0; i < queue->count; ++i)
+                for (i = 0; i < queue->count; ++i) {
+                        queue->buffer[i].error = 0;
                         queue->buffer[i].state = UVC_BUF_STATE_IDLE;
+                }
 
                 queue->flags &= ~UVC_QUEUE_STREAMING;
         }
@@ -488,8 +492,8 @@ struct uvc_buffer *uvc_queue_next_buffer(struct uvc_video_queue *queue,
         struct uvc_buffer *nextbuf;
         unsigned long flags;
 
-        if ((queue->flags & UVC_QUEUE_DROP_INCOMPLETE) &&
-            buf->buf.length != buf->buf.bytesused) {
+        if ((queue->flags & UVC_QUEUE_DROP_CORRUPTED) && buf->error) {
+                buf->error = 0;
                 buf->state = UVC_BUF_STATE_QUEUED;
                 buf->buf.bytesused = 0;
                 return buf;
@@ -497,6 +501,7 @@ struct uvc_buffer *uvc_queue_next_buffer(struct uvc_video_queue *queue,
 
         spin_lock_irqsave(&queue->irqlock, flags);
         list_del(&buf->queue);
+        buf->error = 0;
         buf->state = UVC_BUF_STATE_DONE;
         if (!list_empty(&queue->irqqueue))
                 nextbuf = list_first_entry(&queue->irqqueue, struct uvc_buffer,