aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/omap3isp/ispvideo.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/omap3isp/ispvideo.c')
-rw-r--r--drivers/media/video/omap3isp/ispvideo.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/omap3isp/ispvideo.c b/drivers/media/video/omap3isp/ispvideo.c
index a0bb5db9cb8a..208a7ec739d7 100644
--- a/drivers/media/video/omap3isp/ispvideo.c
+++ b/drivers/media/video/omap3isp/ispvideo.c
@@ -494,12 +494,12 @@ static const struct isp_video_queue_operations isp_video_queue_ops = {
494/* 494/*
495 * omap3isp_video_buffer_next - Complete the current buffer and return the next 495 * omap3isp_video_buffer_next - Complete the current buffer and return the next
496 * @video: ISP video object 496 * @video: ISP video object
497 * @error: Whether an error occured during capture 497 * @error: Whether an error occurred during capture
498 * 498 *
499 * Remove the current video buffer from the DMA queue and fill its timestamp, 499 * Remove the current video buffer from the DMA queue and fill its timestamp,
500 * field count and state fields before waking up its completion handler. 500 * field count and state fields before waking up its completion handler.
501 * 501 *
502 * The buffer state is set to VIDEOBUF_DONE if no error occured (@error is 0) 502 * The buffer state is set to VIDEOBUF_DONE if no error occurred (@error is 0)
503 * or VIDEOBUF_ERROR otherwise (@error is non-zero). 503 * or VIDEOBUF_ERROR otherwise (@error is non-zero).
504 * 504 *
505 * The DMA queue is expected to contain at least one buffer. 505 * The DMA queue is expected to contain at least one buffer.
@@ -578,7 +578,7 @@ struct isp_buffer *omap3isp_video_buffer_next(struct isp_video *video,
578/* 578/*
579 * omap3isp_video_resume - Perform resume operation on the buffers 579 * omap3isp_video_resume - Perform resume operation on the buffers
580 * @video: ISP video object 580 * @video: ISP video object
581 * @continuous: Pipeline is in single shot mode if 0 or continous mode otherwise 581 * @continuous: Pipeline is in single shot mode if 0 or continuous mode otherwise
582 * 582 *
583 * This function is intended to be used on suspend/resume scenario. It 583 * This function is intended to be used on suspend/resume scenario. It
584 * requests video queue layer to discard buffers marked as DONE if it's in 584 * requests video queue layer to discard buffers marked as DONE if it's in