diff options
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/aperture.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/video/aperture.c b/drivers/video/aperture.c index 41e77de1ea82..5c94abdb1ad6 100644 --- a/drivers/video/aperture.c +++ b/drivers/video/aperture.c @@ -332,15 +332,16 @@ int aperture_remove_conflicting_pci_devices(struct pci_dev *pdev, const char *na primary = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW; #endif + if (primary) + sysfb_disable(); + for (bar = 0; bar < PCI_STD_NUM_BARS; ++bar) { if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM)) continue; base = pci_resource_start(pdev, bar); size = pci_resource_len(pdev, bar); - ret = aperture_remove_conflicting_devices(base, size, primary, name); - if (ret) - return ret; + aperture_detach_devices(base, size); } /* |