From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 03 Jan 2024 09:43:39 +0000
Subject: [PATCH] update kernel to 5.10.198
---
kernel/drivers/media/i2c/imx323.c | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/kernel/drivers/media/i2c/imx323.c b/kernel/drivers/media/i2c/imx323.c
index e48b3fa..7ce0856 100644
--- a/kernel/drivers/media/i2c/imx323.c
+++ b/kernel/drivers/media/i2c/imx323.c
@@ -558,9 +558,7 @@
struct imx323 *imx323 = to_imx323(sd);
const struct imx323_mode *mode = imx323->cur_mode;
- mutex_lock(&imx323->mutex);
fi->interval = mode->max_fps;
- mutex_unlock(&imx323->mutex);
return 0;
}
@@ -706,7 +704,7 @@
}
#endif
-static int imx323_g_mbus_config(struct v4l2_subdev *sd,
+static int imx323_g_mbus_config(struct v4l2_subdev *sd, unsigned int pad_id,
struct v4l2_mbus_config *config)
{
config->type = V4L2_MBUS_BT656;
@@ -723,9 +721,7 @@
if (fie->index >= ARRAY_SIZE(supported_modes))
return -EINVAL;
- if (fie->code != PIX_FORMAT)
- return -EINVAL;
-
+ fie->code = PIX_FORMAT;
fie->width = supported_modes[fie->index].width;
fie->height = supported_modes[fie->index].height;
fie->interval = supported_modes[fie->index].max_fps;
@@ -753,7 +749,6 @@
static const struct v4l2_subdev_video_ops imx323_video_ops = {
.s_stream = imx323_s_stream,
- .g_mbus_config = imx323_g_mbus_config,
.g_frame_interval = imx323_g_frame_interval,
};
@@ -763,6 +758,7 @@
.enum_frame_interval = imx323_enum_frame_interval,
.get_fmt = imx323_get_fmt,
.set_fmt = imx323_set_fmt,
+ .get_mbus_config = imx323_g_mbus_config,
};
static const struct v4l2_subdev_ops imx323_subdev_ops = {
--
Gitblit v1.6.2