diff options
Diffstat (limited to 'drivers/media/video/uvc/uvc_video.c')
-rw-r--r-- | drivers/media/video/uvc/uvc_video.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c index 545c0294813d..fc766b9f24c5 100644 --- a/drivers/media/video/uvc/uvc_video.c +++ b/drivers/media/video/uvc/uvc_video.c | |||
@@ -394,11 +394,11 @@ int uvc_commit_video(struct uvc_streaming *stream, | |||
394 | * | 394 | * |
395 | * uvc_video_decode_end is called with header data at the end of a bulk or | 395 | * uvc_video_decode_end is called with header data at the end of a bulk or |
396 | * isochronous payload. It performs any additional header data processing and | 396 | * isochronous payload. It performs any additional header data processing and |
397 | * returns 0 or a negative error code if an error occured. As header data have | 397 | * returns 0 or a negative error code if an error occurred. As header data have |
398 | * already been processed by uvc_video_decode_start, this functions isn't | 398 | * already been processed by uvc_video_decode_start, this functions isn't |
399 | * required to perform sanity checks a second time. | 399 | * required to perform sanity checks a second time. |
400 | * | 400 | * |
401 | * For isochronous transfers where a payload is always transfered in a single | 401 | * For isochronous transfers where a payload is always transferred in a single |
402 | * URB, the three functions will be called in a row. | 402 | * URB, the three functions will be called in a row. |
403 | * | 403 | * |
404 | * To let the decoder process header data and update its internal state even | 404 | * To let the decoder process header data and update its internal state even |
@@ -658,7 +658,7 @@ static void uvc_video_decode_bulk(struct urb *urb, struct uvc_streaming *stream, | |||
658 | buf); | 658 | buf); |
659 | } while (ret == -EAGAIN); | 659 | } while (ret == -EAGAIN); |
660 | 660 | ||
661 | /* If an error occured skip the rest of the payload. */ | 661 | /* If an error occurred skip the rest of the payload. */ |
662 | if (ret < 0 || buf == NULL) { | 662 | if (ret < 0 || buf == NULL) { |
663 | stream->bulk.skip_payload = 1; | 663 | stream->bulk.skip_payload = 1; |
664 | } else { | 664 | } else { |
@@ -821,7 +821,7 @@ static int uvc_alloc_urb_buffers(struct uvc_streaming *stream, | |||
821 | return stream->urb_size / psize; | 821 | return stream->urb_size / psize; |
822 | 822 | ||
823 | /* Compute the number of packets. Bulk endpoints might transfer UVC | 823 | /* Compute the number of packets. Bulk endpoints might transfer UVC |
824 | * payloads accross multiple URBs. | 824 | * payloads across multiple URBs. |
825 | */ | 825 | */ |
826 | npackets = DIV_ROUND_UP(size, psize); | 826 | npackets = DIV_ROUND_UP(size, psize); |
827 | if (npackets > UVC_MAX_PACKETS) | 827 | if (npackets > UVC_MAX_PACKETS) |