On Monday, April 04, 2011 01:51:08 Pawel Osciak wrote:
> The stop_streaming() callback does not return a value anymore.
>
> Signed-off-by: Pawel Osciak <pa...@osciak.com>
> ---
> drivers/media/video/s5p-fimc/fimc-capture.c | 4 ++--
> drivers/media/video/s5p-fimc/fimc-core.c | 4 +---
> 2 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c
> b/drivers/media/video/s5p-fimc/fimc-capture.c
> index 95f8b4e1..34e55a4 100644
> --- a/drivers/media/video/s5p-fimc/fimc-capture.c
> +++ b/drivers/media/video/s5p-fimc/fimc-capture.c
> @@ -247,7 +247,7 @@ static int start_streaming(struct vb2_queue *q)
> return 0;
> }
>
> -static int stop_streaming(struct vb2_queue *q)
> +static void stop_streaming(struct vb2_queue *q)
> {
> struct fimc_ctx *ctx = q->drv_priv;
> struct fimc_dev *fimc = ctx->fimc_dev;
> @@ -255,7 +255,7 @@ static int stop_streaming(struct vb2_queue *q)
> if (!fimc_capture_active(fimc))
> return -EINVAL;
Return in a void function?
Regards,
Hans
>
> - return fimc_stop_capture(fimc);
> + fimc_stop_capture(fimc);
> }
>
> static unsigned int get_plane_size(struct fimc_frame *fr, unsigned int plane)
> diff --git a/drivers/media/video/s5p-fimc/fimc-core.c
> b/drivers/media/video/s5p-fimc/fimc-core.c
> index 6c919b3..66571d7 100644
> --- a/drivers/media/video/s5p-fimc/fimc-core.c
> +++ b/drivers/media/video/s5p-fimc/fimc-core.c
> @@ -348,13 +348,11 @@ static void fimc_m2m_shutdown(struct fimc_ctx *ctx)
> fimc_m2m_job_finish(ctx, VB2_BUF_STATE_ERROR);
> }
>
> -static int stop_streaming(struct vb2_queue *q)
> +static void stop_streaming(struct vb2_queue *q)
> {
> struct fimc_ctx *ctx = q->drv_priv;
>
> fimc_m2m_shutdown(ctx);
> -
> - return 0;
> }
>
> static void fimc_capture_irq_handler(struct fimc_dev *fimc)
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
