aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca
diff options
context:
space:
mode:
authorFrank Zago <frank@zago.net>2008-09-26 06:43:54 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 07:37:12 -0400
commit219423c147f6d4bc91ec904debfbc556887bd8fe (patch)
treea648ea44c3c5641a1fd30192d40b4912f687fb7f /drivers/media/video/gspca
parent3b11fa3a0651984af60cb8ff8faf0338552ece1f (diff)
V4L/DVB (9084): gspca: Fixed a few typos in comments.
Signed-off-by: Frank Zago <frank@zago.net> Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca')
-rw-r--r--drivers/media/video/gspca/gspca.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index f130bb77f705..06e501598140 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -278,7 +278,7 @@ struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev,
278 } 278 }
279 gspca_dev->last_packet_type = packet_type; 279 gspca_dev->last_packet_type = packet_type;
280 280
281 /* if last packet, wake the application and advance in the queue */ 281 /* if last packet, wake up the application and advance in the queue */
282 if (packet_type == LAST_PACKET) { 282 if (packet_type == LAST_PACKET) {
283 frame->v4l2_buf.bytesused = frame->data_end - frame->data; 283 frame->v4l2_buf.bytesused = frame->data_end - frame->data;
284 frame->v4l2_buf.flags &= ~V4L2_BUF_FLAG_QUEUED; 284 frame->v4l2_buf.flags &= ~V4L2_BUF_FLAG_QUEUED;
@@ -420,7 +420,7 @@ static void destroy_urbs(struct gspca_dev *gspca_dev)
420} 420}
421 421
422/* 422/*
423 * search an input transfer endpoint in an alternate setting 423 * look for an input transfer endpoint in an alternate setting
424 */ 424 */
425static struct usb_host_endpoint *alt_xfer(struct usb_host_interface *alt, 425static struct usb_host_endpoint *alt_xfer(struct usb_host_interface *alt,
426 __u8 epaddr, 426 __u8 epaddr,
@@ -444,7 +444,7 @@ static struct usb_host_endpoint *alt_xfer(struct usb_host_interface *alt,
444} 444}
445 445
446/* 446/*
447 * search an input (isoc or bulk) endpoint 447 * look for an input (isoc or bulk) endpoint
448 * 448 *
449 * The endpoint is defined by the subdriver. 449 * The endpoint is defined by the subdriver.
450 * Use only the first isoc (some Zoran - 0x0572:0x0001 - have two such ep). 450 * Use only the first isoc (some Zoran - 0x0572:0x0001 - have two such ep).
@@ -591,7 +591,7 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev)
591 gspca_dev->streaming = 1; 591 gspca_dev->streaming = 1;
592 atomic_set(&gspca_dev->nevent, 0); 592 atomic_set(&gspca_dev->nevent, 0);
593 593
594 /* start the bulk transfer is done by the subdriver */ 594 /* bulk transfers are started by the subdriver */
595 if (gspca_dev->bulk) 595 if (gspca_dev->bulk)
596 break; 596 break;
597 597
@@ -626,7 +626,7 @@ static int gspca_set_alt0(struct gspca_dev *gspca_dev)
626 return ret; 626 return ret;
627} 627}
628 628
629/* Note both the queue and the usb lock should be hold when calling this */ 629/* Note: both the queue and the usb locks should be held when calling this */
630static void gspca_stream_off(struct gspca_dev *gspca_dev) 630static void gspca_stream_off(struct gspca_dev *gspca_dev)
631{ 631{
632 gspca_dev->streaming = 0; 632 gspca_dev->streaming = 0;
@@ -1685,7 +1685,7 @@ static ssize_t dev_read(struct file *file, char __user *data,
1685 } 1685 }
1686 1686
1687 /* if the process slept for more than 1 second, 1687 /* if the process slept for more than 1 second,
1688 * get anewer frame */ 1688 * get a newer frame */
1689 frame = &gspca_dev->frame[v4l2_buf.index]; 1689 frame = &gspca_dev->frame[v4l2_buf.index];
1690 if (--n < 0) 1690 if (--n < 0)
1691 break; /* avoid infinite loop */ 1691 break; /* avoid infinite loop */