From 26383722644674a56971f4841d998b71cb6f8a4d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 1 Jun 2026 17:14:36 +0200 Subject: [PATCH] drop a 5.10 patch --- queue-5.10/series | 1 - ...ckchip-fix-controller-deregistration.patch | 43 ------------------- 2 files changed, 44 deletions(-) delete mode 100644 queue-5.10/spi-rockchip-fix-controller-deregistration.patch diff --git a/queue-5.10/series b/queue-5.10/series index e98217db0f..c5cc97a951 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -199,7 +199,6 @@ ipmi-check-event-message-buffer-response-for-bad-data.patch ipmi-si-return-state-to-normal-if-message-allocation-fails.patch fbdev-udlfb-add-vm_ops-to-dlfb_ops_mmap-to-prevent-use-after-free.patch acpi-video-force-native-backlight-on-hp-omen-16-8a44.patch -spi-rockchip-fix-controller-deregistration.patch net-sched-sch_red-replace-direct-dequeue-call-with-peek-and-qdisc_dequeue_peeked.patch ipmi-ssif-fix-a-shutdown-race.patch ipmi-ssif-clean-up-kthread-on-errors.patch diff --git a/queue-5.10/spi-rockchip-fix-controller-deregistration.patch b/queue-5.10/spi-rockchip-fix-controller-deregistration.patch deleted file mode 100644 index ef6bc573d5..0000000000 --- a/queue-5.10/spi-rockchip-fix-controller-deregistration.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 53e7a16070feb7d1d4d81a583eaac5e25048b9c3 Mon Sep 17 00:00:00 2001 -From: Johan Hovold -Date: Tue, 24 Mar 2026 09:23:23 +0100 -Subject: spi: rockchip: fix controller deregistration - -From: Johan Hovold - -commit 53e7a16070feb7d1d4d81a583eaac5e25048b9c3 upstream. - -Make sure to deregister the controller before freeing underlying -resources like DMA channels during driver unbind. - -Fixes: 64e36824b32b ("spi/rockchip: add driver for Rockchip RK3xxx SoCs integrated SPI") -Cc: stable@vger.kernel.org # 3.17 -Cc: addy ke -Signed-off-by: Johan Hovold -Link: https://patch.msgid.link/20260324082326.901043-3-johan@kernel.org -Signed-off-by: Mark Brown -Signed-off-by: Greg Kroah-Hartman ---- - drivers/spi/spi-rockchip.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/drivers/spi/spi-rockchip.c -+++ b/drivers/spi/spi-rockchip.c -@@ -792,7 +792,7 @@ static int rockchip_spi_probe(struct pla - ctlr->can_dma = rockchip_spi_can_dma; - } - -- ret = devm_spi_register_controller(&pdev->dev, ctlr); -+ ret = spi_register_controller(ctlr); - if (ret < 0) { - dev_err(&pdev->dev, "Failed to register controller\n"); - goto err_free_dma_rx; -@@ -828,6 +828,8 @@ static int rockchip_spi_remove(struct pl - clk_disable_unprepare(rs->spiclk); - clk_disable_unprepare(rs->apb_pclk); - -+ spi_unregister_controller(ctlr); -+ - pm_runtime_put_noidle(&pdev->dev); - pm_runtime_disable(&pdev->dev); - pm_runtime_set_suspended(&pdev->dev); -- 2.47.3