Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18ba53f5 authored by Lad, Prabhakar's avatar Lad, Prabhakar Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: omap3isp: use vb2_buffer_state enum for vb2 buffer state 



use the vb2_buffer_state enum for assigning the state
of the vb2 buffer, along side making isp_pipeline_state
state variable local to the block.
This fixes the following sparse warning as well:
drivers/media/platform/omap3isp/ispvideo.c:497:35: warning: mixing different enum types
drivers/media/platform/omap3isp/ispvideo.c:497:35:     int enum isp_pipeline_state  versus
drivers/media/platform/omap3isp/ispvideo.c:497:35:     int enum vb2_buffer_state

Signed-off-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 87e062d4

drivers/media/platform/omap3isp/ispvideo.c

+6 −4
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ static const struct vb2_ops isp_video_queue_ops = { 
struct isp_buffer *omap3isp_video_buffer_next(struct isp_video *video)

{

	struct isp_pipeline *pipe = to_isp_pipeline(&video->video.entity);

	enum isp_pipeline_state state;

	enum vb2_buffer_state vb_state;

	struct isp_buffer *buf;

	unsigned long flags;
@@ -553,17 +553,19 @@ struct isp_buffer *omap3isp_video_buffer_next(struct isp_video *video) 


	/* Report pipeline errors to userspace on the capture device side. */

	if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE && pipe->error) {

		state = VB2_BUF_STATE_ERROR;

		vb_state = VB2_BUF_STATE_ERROR;

		pipe->error = false;

	} else {

		state = VB2_BUF_STATE_DONE;

		vb_state = VB2_BUF_STATE_DONE;

	}



	vb2_buffer_done(&buf->vb.vb2_buf, state);

	vb2_buffer_done(&buf->vb.vb2_buf, vb_state);



	spin_lock_irqsave(&video->irqlock, flags);



	if (list_empty(&video->dmaqueue)) {

		enum isp_pipeline_state state;



		spin_unlock_irqrestore(&video->irqlock, flags);



		if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)