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

media: ti-vpe: cal: fix enum_mbus_code/frame_size subdev arguments 



Make sure that both enum_mbus_code() and enum_framesize() properly
populate the .which parameter member, otherwise -EINVAL is return
causing the subdev asynchronous registration handshake to fail.

Signed-off-by: default avatarBenoit Parrot <bparrot@ti.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent eb9792a4

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -1493,6 +1493,7 @@ static int cal_enum_framesizes(struct file *file, void *fh, 
	fse.index = fsize->index;

	fse.index = fsize->index;

	fse.pad = 0;

	fse.pad = 0;

	fse.code = fmt->code;

	fse.code = fmt->code;

	fse.which = V4L2_SUBDEV_FORMAT_ACTIVE;





	ret = v4l2_subdev_call(ctx->sensor, pad, enum_frame_size, NULL, &fse);

	ret = v4l2_subdev_call(ctx->sensor, pad, enum_frame_size, NULL, &fse);

	if (ret)

	if (ret)
@@ -1833,6 +1834,7 @@ static int cal_async_bound(struct v4l2_async_notifier *notifier, 




		memset(&mbus_code, 0, sizeof(mbus_code));

		memset(&mbus_code, 0, sizeof(mbus_code));

		mbus_code.index = j;

		mbus_code.index = j;

		mbus_code.which = V4L2_SUBDEV_FORMAT_ACTIVE;

		ret = v4l2_subdev_call(subdev, pad, enum_mbus_code,

		ret = v4l2_subdev_call(subdev, pad, enum_mbus_code,

				       NULL, &mbus_code);

				       NULL, &mbus_code);

		if (ret)

		if (ret)