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

Commit 7f67c587 authored by Benoit Parrot's avatar Benoit Parrot Committed by Mauro Carvalho Chehab
Browse files

[media] media: ti-vpe: cal: Fix unreachable code in enum_frame_interval 



As reported, the current cal_enum_frameintervals() is confusing
and does not have the intended behavior.
Fix this by re-implementing to properly propagate the enum_frame_interval
request to the subdevice.

[mchehab@osg.samsung.com: remove a now bogus "ret = 0" statement]
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reported-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: default avatarBenoit Parrot <bparrot@ti.com>

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent e76bea9a

drivers/media/platform/ti-vpe/cal.c

+12 −29
Original line number Diff line number Diff line
@@ -1201,42 +1201,25 @@ static int cal_enum_frameintervals(struct file *file, void *priv, 
{

	struct cal_ctx *ctx = video_drvdata(file);

	const struct cal_fmt *fmt;

	struct v4l2_subdev_frame_size_enum fse;

	struct v4l2_subdev_frame_interval_enum fie = {

		.index = fival->index,

		.width = fival->width,

		.height = fival->height,

		.which = V4L2_SUBDEV_FORMAT_ACTIVE,

	};

	int ret;



	if (fival->index)

		return -EINVAL;



	fmt = find_format_by_pix(ctx, fival->pixel_format);

	if (!fmt)

		return -EINVAL;



	/* check for valid width/height */

	ret = 0;

	fse.pad = 0;

	fse.code = fmt->code;

	fse.which = V4L2_SUBDEV_FORMAT_ACTIVE;

	for (fse.index = 0; ; fse.index++) {

		ret = v4l2_subdev_call(ctx->sensor, pad, enum_frame_size,

				       NULL, &fse);

	fie.code = fmt->code;

	ret = v4l2_subdev_call(ctx->sensor, pad, enum_frame_interval,

			       NULL, &fie);

	if (ret)

			return -EINVAL;



		if ((fival->width == fse.max_width) &&

		    (fival->height == fse.max_height))

			break;

		else if ((fival->width >= fse.min_width) &&

			 (fival->width <= fse.max_width) &&

			 (fival->height >= fse.min_height) &&

			 (fival->height <= fse.max_height))

			break;



		return -EINVAL;

	}



		return ret;

	fival->type = V4L2_FRMIVAL_TYPE_DISCRETE;

	fival->discrete.numerator = 1;

	fival->discrete.denominator = 30;

	fival->discrete = fie.interval;



	return 0;

}