Commit b1f7f190 authored by Adam Jackson's avatar Adam Jackson 🎧
Browse files

Refuse to load if there's a kernel driver bound to the device



Ported from the equivalent check in nv.
Signed-off-by: Adam Jackson's avatarAdam Jackson <ajax@redhat.com>
parent fba7f460
...@@ -431,8 +431,14 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev, ...@@ -431,8 +431,14 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev,
pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL,
NULL, NULL, NULL, NULL, NULL); NULL, NULL, NULL, NULL, NULL);
if (pScrn != NULL) { if (pScrn != NULL) {
VESAPtr pVesa = VESAGetRec(pScrn); VESAPtr pVesa;
if (pci_device_has_kernel_driver(dev)) {
ErrorF("vesa: Ignoring device with a bound kernel driver\n");
return FALSE;
}
pVesa = VESAGetRec(pScrn);
VESAInitScrn(pScrn); VESAInitScrn(pScrn);
pVesa->pciInfo = dev; pVesa->pciInfo = dev;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment