Skip to contentSkip to conversation

FAILED: patch "[PATCH] media: marvell-cam: fix missing pci_disable_device() on" failed to apply to 5.15-stable tree

PATCH New [email protected] 2 participants 2 messages Jul 29 – Aug 4

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 033ff0420e4c9c240ae5523fff39770298efa964
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026072930-finally-subtype-79f3@gregkh' --subject-prefix 'PATCH 5.15.y' 'HEAD^..'

Possible dependencies:

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 033ff0420e4c9c240ae5523fff39770298efa964 Mon Sep 17 00:00:00 2001
From: Guangshuo Li <[email protected]>
Date: Fri, 17 Apr 2026 14:53:30 +0800
Subject: [PATCH] media: marvell-cam: fix missing pci_disable_device() on
remove

During manual code audit, we found that cafe_pci_probe() enables the PCI device with pci_enable_device(), and its probe error path properly calls pci_disable_device() on failure.

However, cafe_pci_remove() tears down the controller and frees the driver data without disabling the PCI device, leaving the remove path inconsistent with probe cleanup.

Add the missing pci_disable_device() call to cafe_pci_remove().

Fixes abfa3df36c01 ("[media] marvell-cam: Separate out the Marvell camera core")
drivers/media/platform/marvell/cafe-driver.c +1 -0
index 632c15572aa8..22034df6cba9 100644
@@ -609,6 +609,7 @@ static void cafe_pci_remove(struct pci_dev *pdev)
 		return;
 	}
 	cafe_shutdown(cam);
+	pci_disable_device(pdev);
 	kfree(cam);
 }
 
maintainer
#1 lore raw

PATCH 1/1 media: marvell-cam: fix missing pci_disable_device() on remove

From: Guangshuo Li <[email protected]>

[ Upstream commit 033ff0420e4c9c240ae5523fff39770298efa964 ]

During manual code audit, we found that cafe_pci_probe() enables the PCI device with pci_enable_device(), and its probe error path properly calls pci_disable_device() on failure.

However, cafe_pci_remove() tears down the controller and frees the driver data without disabling the PCI device, leaving the remove path inconsistent with probe cleanup.

Add the missing pci_disable_device() call to cafe_pci_remove().

Fixes abfa3df36c01 ("[media] marvell-cam: Separate out the Marvell camera core")
---
 drivers/media/platform/marvell-ccic/cafe-driver.c | 1 +
 1 file changed, 1 insertion(+)
drivers/media/platform/marvell-ccic/cafe-driver.c +1 -0
index 9aa374fa8b364..5e6ef67ae7f90 100644
@@ -610,6 +610,7 @@ static void cafe_pci_remove(struct pci_dev *pdev)
 		return;
 	}
 	cafe_shutdown(cam);
+	pci_disable_device(pdev);
 	kfree(cam);
 }
 
Signature · 1 line
2.53.0