diff options
Diffstat (limited to 'drivers/media/video/uvc/uvc_isight.c')
-rw-r--r-- | drivers/media/video/uvc/uvc_isight.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/uvc/uvc_isight.c b/drivers/media/video/uvc/uvc_isight.c index 74bbe8f18f3..8510e7259e7 100644 --- a/drivers/media/video/uvc/uvc_isight.c +++ b/drivers/media/video/uvc/uvc_isight.c | |||
@@ -74,7 +74,7 @@ static int isight_decode(struct uvc_video_queue *queue, struct uvc_buffer *buf, | |||
74 | * Empty buffers (bytesused == 0) don't trigger end of frame detection | 74 | * Empty buffers (bytesused == 0) don't trigger end of frame detection |
75 | * as it doesn't make sense to return an empty buffer. | 75 | * as it doesn't make sense to return an empty buffer. |
76 | */ | 76 | */ |
77 | if (is_header && buf->buf.bytesused != 0) { | 77 | if (is_header && buf->bytesused != 0) { |
78 | buf->state = UVC_BUF_STATE_DONE; | 78 | buf->state = UVC_BUF_STATE_DONE; |
79 | return -EAGAIN; | 79 | return -EAGAIN; |
80 | } | 80 | } |
@@ -83,13 +83,13 @@ static int isight_decode(struct uvc_video_queue *queue, struct uvc_buffer *buf, | |||
83 | * contain no data. | 83 | * contain no data. |
84 | */ | 84 | */ |
85 | if (!is_header) { | 85 | if (!is_header) { |
86 | maxlen = buf->buf.length - buf->buf.bytesused; | 86 | maxlen = buf->length - buf->bytesused; |
87 | mem = queue->mem + buf->buf.m.offset + buf->buf.bytesused; | 87 | mem = buf->mem + buf->bytesused; |
88 | nbytes = min(len, maxlen); | 88 | nbytes = min(len, maxlen); |
89 | memcpy(mem, data, nbytes); | 89 | memcpy(mem, data, nbytes); |
90 | buf->buf.bytesused += nbytes; | 90 | buf->bytesused += nbytes; |
91 | 91 | ||
92 | if (len > maxlen || buf->buf.bytesused == buf->buf.length) { | 92 | if (len > maxlen || buf->bytesused == buf->length) { |
93 | uvc_trace(UVC_TRACE_FRAME, "Frame complete " | 93 | uvc_trace(UVC_TRACE_FRAME, "Frame complete " |
94 | "(overflow).\n"); | 94 | "(overflow).\n"); |
95 | buf->state = UVC_BUF_STATE_DONE; | 95 | buf->state = UVC_BUF_STATE_DONE; |