Merge remote branch 'kumar/merge' into merge

[pandora-kernel.git] / drivers / media / video / uvc / uvc_video.c

diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c
index 545c029..fc766b9 100644 (file)
--- 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,
  *
  * uvc_video_decode_end is called with header data at the end of a bulk or
  * isochronous payload. It performs any additional header data processing and
- * returns 0 or a negative error code if an error occured. As header data have
+ * returns 0 or a negative error code if an error occurred. As header data have
  * already been processed by uvc_video_decode_start, this functions isn't
  * required to perform sanity checks a second time.
  *
- * For isochronous transfers where a payload is always transfered in a single
+ * For isochronous transfers where a payload is always transferred in a single
  * URB, the three functions will be called in a row.
  *
  * 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,
                                                            buf);
                } while (ret == -EAGAIN);
 
-               /* If an error occured skip the rest of the payload. */
+               /* If an error occurred skip the rest of the payload. */
                if (ret < 0 || buf == NULL) {
                        stream->bulk.skip_payload = 1;
                } else {
@@ -821,7 +821,7 @@ static int uvc_alloc_urb_buffers(struct uvc_streaming *stream,
                return stream->urb_size / psize;
 
        /* Compute the number of packets. Bulk endpoints might transfer UVC
-        * payloads accross multiple URBs.
+        * payloads across multiple URBs.
         */
        npackets = DIV_ROUND_UP(size, psize);
        if (npackets > UVC_MAX_PACKETS)