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

Commit b369a87c authored by Thaissa Falbo's avatar Thaissa Falbo Committed by Greg Kroah-Hartman
Browse files

staging:media:davinci_vpfe: Fixed comparisons with constants warnings 



WARNING: Comparisons should place the constant on the right side of the
test

Fixed warnings by moving the constants to the right side of the comparisons.

Signed-off-by: default avatarThaissa Falbo <thaissa.falbo@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9c5d8933

drivers/staging/media/davinci_vpfe/vpfe_video.c

+12 −12
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ void vpfe_video_schedule_next_buffer(struct vpfe_video_device *video) 
	video->next_frm = list_entry(video->dma_queue.next,

					struct vpfe_cap_buffer, list);



	if (VPFE_PIPELINE_STREAM_SINGLESHOT == video->pipe.state)

	if (video->pipe.state == VPFE_PIPELINE_STREAM_SINGLESHOT)

		video->cur_frm = video->next_frm;



	list_del(&video->next_frm->list);
@@ -1332,8 +1332,8 @@ static int vpfe_reqbufs(struct file *file, void *priv, 


	v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_reqbufs\n");



	if (V4L2_BUF_TYPE_VIDEO_CAPTURE != req_buf->type &&

	    V4L2_BUF_TYPE_VIDEO_OUTPUT != req_buf->type) {

	if (req_buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&

	    req_buf->type != V4L2_BUF_TYPE_VIDEO_OUTPUT){

		v4l2_err(&vpfe_dev->v4l2_dev, "Invalid buffer type\n");

		return -EINVAL;

	}
@@ -1394,8 +1394,8 @@ static int vpfe_querybuf(struct file *file, void *priv, 


	v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_querybuf\n");



	if (V4L2_BUF_TYPE_VIDEO_CAPTURE != buf->type &&

	    V4L2_BUF_TYPE_VIDEO_OUTPUT != buf->type) {

	if (buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&

	    buf->type != V4L2_BUF_TYPE_VIDEO_OUTPUT) {

		v4l2_err(&vpfe_dev->v4l2_dev, "Invalid buf type\n");

		return  -EINVAL;

	}
@@ -1421,8 +1421,8 @@ static int vpfe_qbuf(struct file *file, void *priv, 


	v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_qbuf\n");



	if (V4L2_BUF_TYPE_VIDEO_CAPTURE != p->type &&

	    V4L2_BUF_TYPE_VIDEO_OUTPUT != p->type) {

	if (p->type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&

	    p->type != V4L2_BUF_TYPE_VIDEO_OUTPUT) {

		v4l2_err(&vpfe_dev->v4l2_dev, "Invalid buf type\n");

		return -EINVAL;

	}
@@ -1449,8 +1449,8 @@ static int vpfe_dqbuf(struct file *file, void *priv, 


	v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_dqbuf\n");



	if (V4L2_BUF_TYPE_VIDEO_CAPTURE != buf->type &&

	    V4L2_BUF_TYPE_VIDEO_OUTPUT != buf->type) {

	if (buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&

	    buf->type != V4L2_BUF_TYPE_VIDEO_OUTPUT) {

		v4l2_err(&vpfe_dev->v4l2_dev, "Invalid buf type\n");

		return -EINVAL;

	}
@@ -1482,8 +1482,8 @@ static int vpfe_streamon(struct file *file, void *priv, 


	v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_streamon\n");



	if (V4L2_BUF_TYPE_VIDEO_CAPTURE != buf_type &&

	    V4L2_BUF_TYPE_VIDEO_OUTPUT != buf_type) {

	if (buf_type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&

	    buf_type != V4L2_BUF_TYPE_VIDEO_OUTPUT) {

		v4l2_err(&vpfe_dev->v4l2_dev, "Invalid buf type\n");

		return ret;

	}
@@ -1499,7 +1499,7 @@ static int vpfe_streamon(struct file *file, void *priv, 
		return -EIO;

	}

	/* Validate the pipeline */

	if (V4L2_BUF_TYPE_VIDEO_CAPTURE == buf_type) {

	if (buf_type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {

		ret = vpfe_video_validate_pipeline(pipe);

		if (ret < 0)

			return ret;