diff options
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/aperture.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/video/aperture.c b/drivers/video/aperture.c index 5c94abdb1ad6..7ea18086e659 100644 --- a/drivers/video/aperture.c +++ b/drivers/video/aperture.c @@ -344,13 +344,15 @@ int aperture_remove_conflicting_pci_devices(struct pci_dev *pdev, const char *na aperture_detach_devices(base, size); } - /* - * WARNING: Apparently we must kick fbdev drivers before vgacon, - * otherwise the vga fbdev driver falls over. - */ - ret = vga_remove_vgacon(pdev); - if (ret) - return ret; + if (primary) { + /* + * WARNING: Apparently we must kick fbdev drivers before vgacon, + * otherwise the vga fbdev driver falls over. + */ + ret = vga_remove_vgacon(pdev); + if (ret) + return ret; + } return 0; |