From: Benoit Parrot Date: Tue, 12 Nov 2019 14:53:46 +0000 (+0100) Subject: media: ti-vpe: cal: fix enum_mbus_code/frame_size subdev arguments X-Git-Tag: v5.6-rc1~93^2~189 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af8b32f8326807aec353a12e3003fd0a8e083bb4;p=thirdparty%2Fkernel%2Flinux.git 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: Benoit Parrot Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c index 92a54d59d4338..be54806180a5a 100644 --- a/drivers/media/platform/ti-vpe/cal.c +++ b/drivers/media/platform/ti-vpe/cal.c @@ -1493,6 +1493,7 @@ static int cal_enum_framesizes(struct file *file, void *fh, fse.index = fsize->index; fse.pad = 0; fse.code = fmt->code; + fse.which = V4L2_SUBDEV_FORMAT_ACTIVE; ret = v4l2_subdev_call(ctx->sensor, pad, enum_frame_size, NULL, &fse); if (ret) @@ -1833,6 +1834,7 @@ static int cal_async_bound(struct v4l2_async_notifier *notifier, memset(&mbus_code, 0, sizeof(mbus_code)); mbus_code.index = j; + mbus_code.which = V4L2_SUBDEV_FORMAT_ACTIVE; ret = v4l2_subdev_call(subdev, pad, enum_mbus_code, NULL, &mbus_code); if (ret)