drop a patch

diff --git a/queue-4.19/fsi-master-ast-cf-fix-missing-of_node_put-in-fsi_mas.patch b/queue-4.19/fsi-master-ast-cf-fix-missing-of_node_put-in-fsi_mas.patch
deleted file mode 100644 (file)
index 56a4417..0000000
--- a/queue-4.19/fsi-master-ast-cf-fix-missing-of_node_put-in-fsi_mas.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a5fff52a9467f06e628e4ac7d35ccc95660539ad Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 7 Apr 2022 08:59:11 +0000
-Subject: fsi: master-ast-cf: Fix missing of_node_put in fsi_master_acf_probe
-
-From: Lv Ruyi <lv.ruyi@zte.com.cn>
-
-[ Upstream commit 182d98e00e4745fe253cb0c24c63bbac253464a2 ]
-
-of_parse_phandle returns node pointer with refcount incremented, use
-of_node_put() on it when done.
-
-Reported-by: Zeal Robot <zealci@zte.com.cn>
-Signed-off-by: Lv Ruyi <lv.ruyi@zte.com.cn>
-Link: https://lore.kernel.org/r/20220407085911.2491719-1-lv.ruyi@zte.com.cn
-Signed-off-by: Joel Stanley <joel@jms.id.au>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/fsi/fsi-master-ast-cf.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/fsi/fsi-master-ast-cf.c b/drivers/fsi/fsi-master-ast-cf.c
-index 04d10ea8d343..1d39e435bfd1 100644
---- a/drivers/fsi/fsi-master-ast-cf.c
-+++ b/drivers/fsi/fsi-master-ast-cf.c
-@@ -1324,12 +1324,14 @@ static int fsi_master_acf_probe(struct platform_device *pdev)
-               }
-               master->cvic = devm_of_iomap(&pdev->dev, np, 0, NULL);
-               if (IS_ERR(master->cvic)) {
-+                      of_node_put(np);
-                       rc = PTR_ERR(master->cvic);
-                       dev_err(&pdev->dev, "Error %d mapping CVIC\n", rc);
-                       goto err_free;
-               }
-               rc = of_property_read_u32(np, "copro-sw-interrupts",
-                                         &master->cvic_sw_irq);
-+              of_node_put(np);
-               if (rc) {
-                       dev_err(&pdev->dev, "Can't find coprocessor SW interrupt\n");
-                       goto err_free;
--- 
-2.35.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 9c8f7a25bb7b623bdf03cd8b227c5762ecc3bdb6..c06a5832afacae79671018df21ed9240a8f5ff8b 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -220,7 +220,6 @@ usb-musb-fix-musb_gadget.c-rxstate-overflow-bug.patch
 revert-usb-storage-add-quirk-for-samsung-fit-flash.patch
 nvme-copy-firmware_rev-on-each-init.patch
 usb-idmouse-fix-an-uninit-value-in-idmouse_open.patch
-fsi-master-ast-cf-fix-missing-of_node_put-in-fsi_mas.patch
 clk-bcm2835-make-peripheral-pllc-critical.patch
 perf-intel-pt-fix-segfault-in-intel_pt_print_info-with-uclibc.patch
 net-ieee802154-return-einval-for-unknown-addr-type.patch

diff --git a/queue-5.10/fsi-master-ast-cf-fix-missing-of_node_put-in-fsi_mas.patch b/queue-5.10/fsi-master-ast-cf-fix-missing-of_node_put-in-fsi_mas.patch
deleted file mode 100644 (file)
index 8a90df4..0000000
--- a/queue-5.10/fsi-master-ast-cf-fix-missing-of_node_put-in-fsi_mas.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 1a02109d512900f94a2b925629c63b5d80af8c93 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 7 Apr 2022 08:59:11 +0000
-Subject: fsi: master-ast-cf: Fix missing of_node_put in fsi_master_acf_probe
-
-From: Lv Ruyi <lv.ruyi@zte.com.cn>
-
-[ Upstream commit 182d98e00e4745fe253cb0c24c63bbac253464a2 ]
-
-of_parse_phandle returns node pointer with refcount incremented, use
-of_node_put() on it when done.
-
-Reported-by: Zeal Robot <zealci@zte.com.cn>
-Signed-off-by: Lv Ruyi <lv.ruyi@zte.com.cn>
-Link: https://lore.kernel.org/r/20220407085911.2491719-1-lv.ruyi@zte.com.cn
-Signed-off-by: Joel Stanley <joel@jms.id.au>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/fsi/fsi-master-ast-cf.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/fsi/fsi-master-ast-cf.c b/drivers/fsi/fsi-master-ast-cf.c
-index 70c03e304d6c..ae27ea30fe2d 100644
---- a/drivers/fsi/fsi-master-ast-cf.c
-+++ b/drivers/fsi/fsi-master-ast-cf.c
-@@ -1325,12 +1325,14 @@ static int fsi_master_acf_probe(struct platform_device *pdev)
-               }
-               master->cvic = devm_of_iomap(&pdev->dev, np, 0, NULL);
-               if (IS_ERR(master->cvic)) {
-+                      of_node_put(np);
-                       rc = PTR_ERR(master->cvic);
-                       dev_err(&pdev->dev, "Error %d mapping CVIC\n", rc);
-                       goto err_free;
-               }
-               rc = of_property_read_u32(np, "copro-sw-interrupts",
-                                         &master->cvic_sw_irq);
-+              of_node_put(np);
-               if (rc) {
-                       dev_err(&pdev->dev, "Can't find coprocessor SW interrupt\n");
-                       goto err_free;
--- 
-2.35.1
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 02b9833ca6875d077f9e6a1f1e17776fe9d8fb32..1c9f16ec903289a7dddcd0da99f88d8184a68ec9 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -387,7 +387,6 @@ staging-rtl8723bs-fix-a-potential-memory-leak-in-rtw.patch
 nvme-copy-firmware_rev-on-each-init.patch
 nvmet-tcp-add-bounds-check-on-transfer-tag.patch
 usb-idmouse-fix-an-uninit-value-in-idmouse_open.patch
-fsi-master-ast-cf-fix-missing-of_node_put-in-fsi_mas.patch
 clk-bcm2835-make-peripheral-pllc-critical.patch
 perf-intel-pt-fix-segfault-in-intel_pt_print_info-with-uclibc.patch
 arm64-topology-fix-possible-overflow-in-amu_fie_setup.patch

diff --git a/queue-5.15/fsi-master-ast-cf-fix-missing-of_node_put-in-fsi_mas.patch b/queue-5.15/fsi-master-ast-cf-fix-missing-of_node_put-in-fsi_mas.patch
deleted file mode 100644 (file)
index b097ac8..0000000
--- a/queue-5.15/fsi-master-ast-cf-fix-missing-of_node_put-in-fsi_mas.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From d9f6437c0a9dedc760f98edc714e4ed490262a40 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 7 Apr 2022 08:59:11 +0000
-Subject: fsi: master-ast-cf: Fix missing of_node_put in fsi_master_acf_probe
-
-From: Lv Ruyi <lv.ruyi@zte.com.cn>
-
-[ Upstream commit 182d98e00e4745fe253cb0c24c63bbac253464a2 ]
-
-of_parse_phandle returns node pointer with refcount incremented, use
-of_node_put() on it when done.
-
-Reported-by: Zeal Robot <zealci@zte.com.cn>
-Signed-off-by: Lv Ruyi <lv.ruyi@zte.com.cn>
-Link: https://lore.kernel.org/r/20220407085911.2491719-1-lv.ruyi@zte.com.cn
-Signed-off-by: Joel Stanley <joel@jms.id.au>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/fsi/fsi-master-ast-cf.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/fsi/fsi-master-ast-cf.c b/drivers/fsi/fsi-master-ast-cf.c
-index 24292acdbaf8..5f608ef8b53c 100644
---- a/drivers/fsi/fsi-master-ast-cf.c
-+++ b/drivers/fsi/fsi-master-ast-cf.c
-@@ -1324,12 +1324,14 @@ static int fsi_master_acf_probe(struct platform_device *pdev)
-               }
-               master->cvic = devm_of_iomap(&pdev->dev, np, 0, NULL);
-               if (IS_ERR(master->cvic)) {
-+                      of_node_put(np);
-                       rc = PTR_ERR(master->cvic);
-                       dev_err(&pdev->dev, "Error %d mapping CVIC\n", rc);
-                       goto err_free;
-               }
-               rc = of_property_read_u32(np, "copro-sw-interrupts",
-                                         &master->cvic_sw_irq);
-+              of_node_put(np);
-               if (rc) {
-                       dev_err(&pdev->dev, "Can't find coprocessor SW interrupt\n");
-                       goto err_free;
--- 
-2.35.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 8b93b11b05dde1cb0be50d2f2218d77761d40a58..e6c1c5f8f0c6bcab14ad18f3e1d433e62be224e6 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -515,7 +515,6 @@ ext2-use-kvmalloc-for-group-descriptor-array.patch
 nvme-copy-firmware_rev-on-each-init.patch
 nvmet-tcp-add-bounds-check-on-transfer-tag.patch
 usb-idmouse-fix-an-uninit-value-in-idmouse_open.patch
-fsi-master-ast-cf-fix-missing-of_node_put-in-fsi_mas.patch
 clk-bcm2835-make-peripheral-pllc-critical.patch
 clk-bcm2835-round-uart-input-clock-up.patch
 perf-intel-pt-fix-segfault-in-intel_pt_print_info-with-uclibc.patch

diff --git a/queue-5.19/fsi-master-ast-cf-fix-missing-of_node_put-in-fsi_mas.patch b/queue-5.19/fsi-master-ast-cf-fix-missing-of_node_put-in-fsi_mas.patch
deleted file mode 100644 (file)
index 002ee65..0000000
--- a/queue-5.19/fsi-master-ast-cf-fix-missing-of_node_put-in-fsi_mas.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 7d46d14b71a5847c8ec56d13aaed719592f93fdf Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 7 Apr 2022 08:59:11 +0000
-Subject: fsi: master-ast-cf: Fix missing of_node_put in fsi_master_acf_probe
-
-From: Lv Ruyi <lv.ruyi@zte.com.cn>
-
-[ Upstream commit 182d98e00e4745fe253cb0c24c63bbac253464a2 ]
-
-of_parse_phandle returns node pointer with refcount incremented, use
-of_node_put() on it when done.
-
-Reported-by: Zeal Robot <zealci@zte.com.cn>
-Signed-off-by: Lv Ruyi <lv.ruyi@zte.com.cn>
-Link: https://lore.kernel.org/r/20220407085911.2491719-1-lv.ruyi@zte.com.cn
-Signed-off-by: Joel Stanley <joel@jms.id.au>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/fsi/fsi-master-ast-cf.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/fsi/fsi-master-ast-cf.c b/drivers/fsi/fsi-master-ast-cf.c
-index 24292acdbaf8..5f608ef8b53c 100644
---- a/drivers/fsi/fsi-master-ast-cf.c
-+++ b/drivers/fsi/fsi-master-ast-cf.c
-@@ -1324,12 +1324,14 @@ static int fsi_master_acf_probe(struct platform_device *pdev)
-               }
-               master->cvic = devm_of_iomap(&pdev->dev, np, 0, NULL);
-               if (IS_ERR(master->cvic)) {
-+                      of_node_put(np);
-                       rc = PTR_ERR(master->cvic);
-                       dev_err(&pdev->dev, "Error %d mapping CVIC\n", rc);
-                       goto err_free;
-               }
-               rc = of_property_read_u32(np, "copro-sw-interrupts",
-                                         &master->cvic_sw_irq);
-+              of_node_put(np);
-               if (rc) {
-                       dev_err(&pdev->dev, "Can't find coprocessor SW interrupt\n");
-                       goto err_free;
--- 
-2.35.1
-

diff --git a/queue-5.19/series b/queue-5.19/series
index cf24b8d211e22de600b4c1aaafc93ff9775e3485..3aba87cf4f5d01a683521b74a3aa2f49ce0b433a 100644 (file)
--- a/queue-5.19/series
+++ b/queue-5.19/series
@@ -689,7 +689,6 @@ usb-idmouse-fix-an-uninit-value-in-idmouse_open.patch
 blk-mq-use-quiesced-elevator-switch-when-reinitializ.patch
 hwmon-occ-retry-for-checksum-failure.patch
 fsi-occ-prevent-use-after-free.patch
-fsi-master-ast-cf-fix-missing-of_node_put-in-fsi_mas.patch
 usb-typec-ucsi-don-t-warn-on-probe-deferral.patch
 clk-bcm2835-make-peripheral-pllc-critical.patch
 clk-bcm2835-round-uart-input-clock-up.patch

diff --git a/queue-5.4/fsi-master-ast-cf-fix-missing-of_node_put-in-fsi_mas.patch b/queue-5.4/fsi-master-ast-cf-fix-missing-of_node_put-in-fsi_mas.patch
deleted file mode 100644 (file)
index 6c08e56..0000000
--- a/queue-5.4/fsi-master-ast-cf-fix-missing-of_node_put-in-fsi_mas.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 9c0a6b26564fa9d940d986ca54de0afffe380b88 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 7 Apr 2022 08:59:11 +0000
-Subject: fsi: master-ast-cf: Fix missing of_node_put in fsi_master_acf_probe
-
-From: Lv Ruyi <lv.ruyi@zte.com.cn>
-
-[ Upstream commit 182d98e00e4745fe253cb0c24c63bbac253464a2 ]
-
-of_parse_phandle returns node pointer with refcount incremented, use
-of_node_put() on it when done.
-
-Reported-by: Zeal Robot <zealci@zte.com.cn>
-Signed-off-by: Lv Ruyi <lv.ruyi@zte.com.cn>
-Link: https://lore.kernel.org/r/20220407085911.2491719-1-lv.ruyi@zte.com.cn
-Signed-off-by: Joel Stanley <joel@jms.id.au>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/fsi/fsi-master-ast-cf.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/fsi/fsi-master-ast-cf.c b/drivers/fsi/fsi-master-ast-cf.c
-index 04d10ea8d343..1d39e435bfd1 100644
---- a/drivers/fsi/fsi-master-ast-cf.c
-+++ b/drivers/fsi/fsi-master-ast-cf.c
-@@ -1324,12 +1324,14 @@ static int fsi_master_acf_probe(struct platform_device *pdev)
-               }
-               master->cvic = devm_of_iomap(&pdev->dev, np, 0, NULL);
-               if (IS_ERR(master->cvic)) {
-+                      of_node_put(np);
-                       rc = PTR_ERR(master->cvic);
-                       dev_err(&pdev->dev, "Error %d mapping CVIC\n", rc);
-                       goto err_free;
-               }
-               rc = of_property_read_u32(np, "copro-sw-interrupts",
-                                         &master->cvic_sw_irq);
-+              of_node_put(np);
-               if (rc) {
-                       dev_err(&pdev->dev, "Can't find coprocessor SW interrupt\n");
-                       goto err_free;
--- 
-2.35.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index c30202421a4ac18ed53cba0498f6212fb6fbbcd6..8d8df04eed21979fffeb036af364663bf1f84a8a 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -244,7 +244,6 @@ staging-rtl8723bs-fix-a-potential-memory-leak-in-rtw.patch
 nvme-copy-firmware_rev-on-each-init.patch
 nvmet-tcp-add-bounds-check-on-transfer-tag.patch
 usb-idmouse-fix-an-uninit-value-in-idmouse_open.patch
-fsi-master-ast-cf-fix-missing-of_node_put-in-fsi_mas.patch
 clk-bcm2835-make-peripheral-pllc-critical.patch
 perf-intel-pt-fix-segfault-in-intel_pt_print_info-with-uclibc.patch
 io_uring-af_unix-defer-registered-files-gc-to-io_uring-release.patch