diff --git a/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c b/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c index 952b997d4728eb304400994ec35555b0c2a756cd..b5b03169bfe19974fd21222dda2bd77d1c701e80 100644 --- a/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c +++ b/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c @@ -328,7 +328,7 @@ static int mxc_v4l2_buffer_status(cam_data *cam, struct v4l2_buffer *buf) { pr_debug("In MVC:mxc_v4l2_buffer_status\n"); - if (buf->index < 0 || buf->index >= FRAME_NUM) { + if (buf->index >= FRAME_NUM) { pr_err("ERROR: v4l2 capture: mxc_v4l2_buffer_status buffers " "not allocated\n"); return -EINVAL; @@ -348,7 +348,7 @@ static int mxc_v4l2_prepare_bufs(cam_data *cam, struct v4l2_buffer *buf) { pr_debug("In MVC:mxc_v4l2_prepare_bufs\n"); - if (buf->index < 0 || buf->index >= FRAME_NUM || buf->length < + if (buf->index >= FRAME_NUM || buf->length < PAGE_ALIGN(cam->v2f.fmt.pix.sizeimage)) { pr_err("ERROR: v4l2 capture: mxc_v4l2_prepare_bufs buffers " "not allocated,index=%d, length=%d\n", buf->index, diff --git a/drivers/media/platform/mxc/capture/ov5647_mipi.c b/drivers/media/platform/mxc/capture/ov5647_mipi.c index 109f77438f514cc7a4ac0a570d51bf2003769176..327481f06c590d97fcb71ffb79fd3e268645c061 100644 --- a/drivers/media/platform/mxc/capture/ov5647_mipi.c +++ b/drivers/media/platform/mxc/capture/ov5647_mipi.c @@ -1441,7 +1441,7 @@ static int ov5647_enum_frameintervals(struct v4l2_subdev *sd, { int i, j, count; - if (fie->index < 0 || fie->index > ov5647_mode_MAX) + if (fie->index > ov5647_mode_MAX) return -EINVAL; if (fie->width == 0 || fie->height == 0 ||