diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2012-09-17 22:11:33 -0700 |
|---|---|---|
| committer | Yinghai Lu <yinghai@kernel.org> | 2012-09-17 22:11:33 -0700 |
| commit | 836d463eb136b9ea4b4c97182c6137aaf2c6a8d9 (patch) | |
| tree | 829b4a23952f9a95b7d298c34d67b20b14f836b4 | |
| parent | 8693c9dea0d0ee875644cbb66a13768a56b69685 (diff) | |
| download | linux-yinghai-836d463eb136b9ea4b4c97182c6137aaf2c6a8d9.tar.gz | |
PCI, x86: fix default vga ref_count
when __ARCH_HAS_VGA_DEFAULT_DEVICE is not defined, aka EFIFB is not used,
for static path, vga_default setting is through vga_arbiter_add_pci_device.
and for x86 pci_fixup_video, will skip that.
because subsys_initcall(vga_arb_device_init) come first to call vga_arbiter_add_pci_device.
for hotplug path, even vga_arbiter_add_pci_device is called via notifier, but it
will check VGA_RSRC_LEGACY_MASK that is not set for hotplug path.
So x86 pci_fixup_video will take over to call vga_set_default_device().
We need to hold one dev reference there.
otherwise vga_arbiter_del_pci_device that does not check VGA_RSRC_LEGACY_MASK
will call put_device and it will cause ref_count to decrease extra.
that will have that device get deleted early wrongly.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: x86@kernel.org
| -rw-r--r-- | arch/x86/pci/fixup.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c index af8a224db216ad..76959453582921 100644 --- a/arch/x86/pci/fixup.c +++ b/arch/x86/pci/fixup.c @@ -349,8 +349,12 @@ static void __devinit pci_fixup_video(struct pci_dev *pdev) if (config & (PCI_COMMAND_IO | PCI_COMMAND_MEMORY)) { pdev->resource[PCI_ROM_RESOURCE].flags |= IORESOURCE_ROM_SHADOW; dev_printk(KERN_DEBUG, &pdev->dev, "Boot video device\n"); - if (!vga_default_device()) + if (!vga_default_device()) { +#ifndef __ARCH_HAS_VGA_DEFAULT_DEVICE + pdev = pci_dev_get(pdev); +#endif vga_set_default_device(pdev); + } } } DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, |