Drop media-atomisp-fix-v4l2_fh-resource-leak-on-open-erro.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/media-atomisp-fix-v4l2_fh-resource-leak-on-open-erro.patch b/queue-4.14/media-atomisp-fix-v4l2_fh-resource-leak-on-open-erro.patch
deleted file mode 100644 (file)
index 98f5350..0000000
--- a/queue-4.14/media-atomisp-fix-v4l2_fh-resource-leak-on-open-erro.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From ea45a7d2bef8e255762a0bcaba8b6bfc0a4bd328 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 29 Aug 2022 12:35:43 +0200
-Subject: media: atomisp: Fix v4l2_fh resource leak on open errors
-
-From: Hans de Goede <hdegoede@redhat.com>
-
-[ Upstream commit 5b9853ad1329be49343a608d574eb232ff1273d0 ]
-
-When atomisp_open() fails then it must call v4l2_fh_release() to undo
-the results of v4l2_fh_open().
-
-Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c
-index f1d8cc5a2730..0645751b4b19 100644
---- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c
-+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c
-@@ -888,6 +888,7 @@ static int atomisp_open(struct file *file)
-       hmm_pool_unregister(HMM_POOL_TYPE_DYNAMIC);
-       pm_runtime_put(vdev->v4l2_dev->dev);
-       rt_mutex_unlock(&isp->mutex);
-+      v4l2_fh_release(file);
-       return ret;
- }
- 
--- 
-2.35.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index 98004095000c795593e5ffccd3c0e74e55b59c09..9a7f5298bf84b2765ca29eabe59860cb75f5a4b7 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -19,5 +19,4 @@ net-mdio-fix-undefined-behavior-in-bit-shift-for-__m.patch
 net-neigh-fix-null-ptr-deref-in-neigh_table_clear.patch
 media-s5p_cec-limit-msg.len-to-cec_max_msg_size.patch
 media-dvb-frontends-drxk-initialize-err-to-0.patch
-media-atomisp-fix-v4l2_fh-resource-leak-on-open-erro.patch
 i2c-xiic-add-platform-module-alias.patch

diff --git a/queue-5.10/media-atomisp-fix-v4l2_fh-resource-leak-on-open-erro.patch b/queue-5.10/media-atomisp-fix-v4l2_fh-resource-leak-on-open-erro.patch
deleted file mode 100644 (file)
index 17b924d..0000000
--- a/queue-5.10/media-atomisp-fix-v4l2_fh-resource-leak-on-open-erro.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e8eacb206e0e57145765dda1a9e0e13af20af27a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 29 Aug 2022 12:35:43 +0200
-Subject: media: atomisp: Fix v4l2_fh resource leak on open errors
-
-From: Hans de Goede <hdegoede@redhat.com>
-
-[ Upstream commit 5b9853ad1329be49343a608d574eb232ff1273d0 ]
-
-When atomisp_open() fails then it must call v4l2_fh_release() to undo
-the results of v4l2_fh_open().
-
-Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/staging/media/atomisp/pci/atomisp_fops.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/staging/media/atomisp/pci/atomisp_fops.c b/drivers/staging/media/atomisp/pci/atomisp_fops.c
-index b751df31cc24..ccf398b42520 100644
---- a/drivers/staging/media/atomisp/pci/atomisp_fops.c
-+++ b/drivers/staging/media/atomisp/pci/atomisp_fops.c
-@@ -890,6 +890,7 @@ static int atomisp_open(struct file *file)
-       hmm_pool_unregister(HMM_POOL_TYPE_DYNAMIC);
-       pm_runtime_put(vdev->v4l2_dev->dev);
-       rt_mutex_unlock(&isp->mutex);
-+      v4l2_fh_release(file);
-       return ret;
- }
- 
--- 
-2.35.1
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 862f5983682a455e353d498f7479e563aa6afd3f..5b46e991090aaa1ff0b576bb2b39f6cc3b76a685 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -62,7 +62,6 @@ media-s5p_cec-limit-msg.len-to-cec_max_msg_size.patch
 media-cros-ec-cec-limit-msg.len-to-cec_max_msg_size.patch
 media-dvb-frontends-drxk-initialize-err-to-0.patch
 media-meson-vdec-fix-possible-refcount-leak-in-vdec_.patch
-media-atomisp-fix-v4l2_fh-resource-leak-on-open-erro.patch
 acpi-apei-fix-integer-overflow-in-ghes_estatus_pool_.patch
 scsi-core-restrict-legal-sdev_state-transitions-via-.patch
 hid-saitek-add-madcatz-variant-of-mmo7-mouse-device-.patch

diff --git a/queue-5.15/media-atomisp-fix-v4l2_fh-resource-leak-on-open-erro.patch b/queue-5.15/media-atomisp-fix-v4l2_fh-resource-leak-on-open-erro.patch
deleted file mode 100644 (file)
index c0b61c9..0000000
--- a/queue-5.15/media-atomisp-fix-v4l2_fh-resource-leak-on-open-erro.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 76cdb51b98fdd048bd718c5d58c4d278b14a2004 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 29 Aug 2022 12:35:43 +0200
-Subject: media: atomisp: Fix v4l2_fh resource leak on open errors
-
-From: Hans de Goede <hdegoede@redhat.com>
-
-[ Upstream commit 5b9853ad1329be49343a608d574eb232ff1273d0 ]
-
-When atomisp_open() fails then it must call v4l2_fh_release() to undo
-the results of v4l2_fh_open().
-
-Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/staging/media/atomisp/pci/atomisp_fops.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/staging/media/atomisp/pci/atomisp_fops.c b/drivers/staging/media/atomisp/pci/atomisp_fops.c
-index 18fff47bd25d..cb61ffb7d3b2 100644
---- a/drivers/staging/media/atomisp/pci/atomisp_fops.c
-+++ b/drivers/staging/media/atomisp/pci/atomisp_fops.c
-@@ -890,6 +890,7 @@ static int atomisp_open(struct file *file)
- error:
-       hmm_pool_unregister(HMM_POOL_TYPE_DYNAMIC);
-       rt_mutex_unlock(&isp->mutex);
-+      v4l2_fh_release(file);
-       return ret;
- }
- 
--- 
-2.35.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 49208b5692adfe4db06e2a91e279215207573ddf..ea3980af8f09c00dfb2e46936b05b0a8d8afecc5 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -78,7 +78,6 @@ media-dvb-frontends-drxk-initialize-err-to-0.patch
 media-meson-vdec-fix-possible-refcount-leak-in-vdec_.patch
 media-v4l-subdev-fail-graciously-when-getting-try-da.patch
 media-atomisp-fix-vidioc_try_fmt.patch
-media-atomisp-fix-v4l2_fh-resource-leak-on-open-erro.patch
 acpi-apei-fix-integer-overflow-in-ghes_estatus_pool_.patch
 scsi-core-restrict-legal-sdev_state-transitions-via-.patch
 hid-saitek-add-madcatz-variant-of-mmo7-mouse-device-.patch

diff --git a/queue-6.0/media-atomisp-fix-v4l2_fh-resource-leak-on-open-erro.patch b/queue-6.0/media-atomisp-fix-v4l2_fh-resource-leak-on-open-erro.patch
deleted file mode 100644 (file)
index 0d9e07b..0000000
--- a/queue-6.0/media-atomisp-fix-v4l2_fh-resource-leak-on-open-erro.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 63c59e68ddb07f9f33b20fde2eae5c75746074d4 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 29 Aug 2022 12:35:43 +0200
-Subject: media: atomisp: Fix v4l2_fh resource leak on open errors
-
-From: Hans de Goede <hdegoede@redhat.com>
-
-[ Upstream commit 5b9853ad1329be49343a608d574eb232ff1273d0 ]
-
-When atomisp_open() fails then it must call v4l2_fh_release() to undo
-the results of v4l2_fh_open().
-
-Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/staging/media/atomisp/pci/atomisp_fops.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/staging/media/atomisp/pci/atomisp_fops.c b/drivers/staging/media/atomisp/pci/atomisp_fops.c
-index 77150e4ae144..92cbc0e263e8 100644
---- a/drivers/staging/media/atomisp/pci/atomisp_fops.c
-+++ b/drivers/staging/media/atomisp/pci/atomisp_fops.c
-@@ -903,6 +903,7 @@ static int atomisp_open(struct file *file)
-       pm_runtime_put(vdev->v4l2_dev->dev);
- error:
-       rt_mutex_unlock(&isp->mutex);
-+      v4l2_fh_release(file);
-       return ret;
- }
- 
--- 
-2.35.1
-

diff --git a/queue-6.0/series b/queue-6.0/series
index fdcbf73565171bc43dff2520f5b013db9663bfbf..156350302fac0edbb55f2d6f72b16db0b164b4cd 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -78,7 +78,6 @@ media-hantro-hevc-fix-auxilary-buffer-size-calculati.patch
 media-hantro-hevc-fix-chroma-offset-computation.patch
 media-v4l-subdev-fail-graciously-when-getting-try-da.patch
 media-atomisp-fix-vidioc_try_fmt.patch
-media-atomisp-fix-v4l2_fh-resource-leak-on-open-erro.patch
 drm-vc4-hdmi-check-the-hsm-rate-at-runtime_resume.patch
 acpi-apei-fix-integer-overflow-in-ghes_estatus_pool_.patch
 hwrng-bcm2835-use-hwrng_msleep-instead-of-cpu_relax.patch