Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'pci-v6.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
Pull PCI fix from Bjorn Helgaas:
- When removing a PCI device, only look up and remove a platform device
if there is an associated device node for which there could be a
platform device, to fix a merge window regression (Brian Norris)
* tag 'pci-v6.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
PCI/pwrctrl: Unregister platform device only if one actually exists
+7
-2
+7
-2
drivers/pci/remove.c
+7
-2
drivers/pci/remove.c
···
19
19
20
20
static void pci_pwrctrl_unregister(struct device *dev)
21
21
{
22
+
struct device_node *np;
22
23
struct platform_device *pdev;
23
24
24
-
pdev = of_find_device_by_node(dev_of_node(dev));
25
+
np = dev_of_node(dev);
26
+
if (!np)
27
+
return;
28
+
29
+
pdev = of_find_device_by_node(np);
25
30
if (!pdev)
26
31
return;
27
32
28
33
of_device_unregister(pdev);
29
-
of_node_clear_flag(dev_of_node(dev), OF_POPULATED);
34
+
of_node_clear_flag(np, OF_POPULATED);
30
35
}
31
36
32
37
static void pci_stop_dev(struct pci_dev *dev)