From d501264306c7a745c3a32d7aa51fdca2be55e63e Mon Sep 17 00:00:00 2001 From: Cai Wenzhong Date: Fri, 26 Jul 2024 16:35:59 +0800 Subject: [PATCH] media: i2c: maxim: driver version v3.09.00 Signed-off-by: Cai Wenzhong Change-Id: I0ac1c3faf127c196a3154d188d6c307d3f0043c5 --- drivers/media/i2c/maxim/local/maxim2c/maxim2c_drv.c | 6 +++++- drivers/media/i2c/maxim/local/maxim2c/maxim2c_v4l2.c | 2 +- drivers/media/i2c/maxim/local/maxim4c/maxim4c_drv.c | 6 +++++- drivers/media/i2c/maxim/local/maxim4c/maxim4c_v4l2.c | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/maxim/local/maxim2c/maxim2c_drv.c b/drivers/media/i2c/maxim/local/maxim2c/maxim2c_drv.c index 2d51167a1b66..ae3be2f197e9 100644 --- a/drivers/media/i2c/maxim/local/maxim2c/maxim2c_drv.c +++ b/drivers/media/i2c/maxim/local/maxim2c/maxim2c_drv.c @@ -60,6 +60,10 @@ * 1. wait link lock stable when hot plug is detected * 2. link get lock state retry if i2c error * + * V3.09.00 + * 1. if remote camera not connected, hot plug state check timer working, + * fix the issue of mutex deadlock when stream off. + * */ #include #include @@ -87,7 +91,7 @@ #include "maxim2c_api.h" -#define DRIVER_VERSION KERNEL_VERSION(3, 0x08, 0x00) +#define DRIVER_VERSION KERNEL_VERSION(3, 0x09, 0x00) #define MAXIM2C_NAME "maxim2c" diff --git a/drivers/media/i2c/maxim/local/maxim2c/maxim2c_v4l2.c b/drivers/media/i2c/maxim/local/maxim2c/maxim2c_v4l2.c index 9c6d53e3e5be..1f4c331b0583 100644 --- a/drivers/media/i2c/maxim/local/maxim2c/maxim2c_v4l2.c +++ b/drivers/media/i2c/maxim/local/maxim2c/maxim2c_v4l2.c @@ -761,7 +761,7 @@ static int __maxim2c_stop_stream(maxim2c_t *maxim2c) disable_irq(maxim2c->hot_plug_irq); if (maxim2c->hot_plug_work.state_check_wq) - cancel_delayed_work_sync(&maxim2c->hot_plug_work.state_d_work); + cancel_delayed_work(&maxim2c->hot_plug_work.state_d_work); ret |= maxim2c_mipi_csi_output(maxim2c, false); ret |= maxim2c_mipi_txphy_enable(maxim2c, false); diff --git a/drivers/media/i2c/maxim/local/maxim4c/maxim4c_drv.c b/drivers/media/i2c/maxim/local/maxim4c/maxim4c_drv.c index 7cabbf794a83..28726207b43d 100644 --- a/drivers/media/i2c/maxim/local/maxim4c/maxim4c_drv.c +++ b/drivers/media/i2c/maxim/local/maxim4c/maxim4c_drv.c @@ -83,6 +83,10 @@ * 1. wait link lock stable when hot plug is detected * 2. link get lock state retry if i2c error * + * V3.09.00 + * 1. if remote camera not connected, hot plug state check timer working, + * fix the issue of mutex deadlock when stream off. + * */ #include #include @@ -110,7 +114,7 @@ #include "maxim4c_api.h" -#define DRIVER_VERSION KERNEL_VERSION(3, 0x08, 0x00) +#define DRIVER_VERSION KERNEL_VERSION(3, 0x09, 0x00) #define MAXIM4C_NAME "maxim4c" diff --git a/drivers/media/i2c/maxim/local/maxim4c/maxim4c_v4l2.c b/drivers/media/i2c/maxim/local/maxim4c/maxim4c_v4l2.c index 0b87827f14f9..6b1519c98008 100644 --- a/drivers/media/i2c/maxim/local/maxim4c/maxim4c_v4l2.c +++ b/drivers/media/i2c/maxim/local/maxim4c/maxim4c_v4l2.c @@ -761,7 +761,7 @@ static int __maxim4c_stop_stream(maxim4c_t *maxim4c) disable_irq(maxim4c->hot_plug_irq); if (maxim4c->hot_plug_work.state_check_wq) - cancel_delayed_work_sync(&maxim4c->hot_plug_work.state_d_work); + cancel_delayed_work(&maxim4c->hot_plug_work.state_d_work); ret |= maxim4c_mipi_csi_output(maxim4c, false); ret |= maxim4c_mipi_txphy_enable(maxim4c, false);