From 133f7c4d51b3c7d7e1e7af80056947d3a7ec2097 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Fri, 28 Aug 2009 09:43:16 +1000 Subject: nv: refuse to load if there's a kernel driver bound to the device already Signed-off-by: Aaron Plattner --- src/nv_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/nv_driver.c b/src/nv_driver.c index 3063633..9fe70b2 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -865,6 +865,12 @@ NVPciProbe(DriverPtr drv, int entity, struct pci_device *dev, intptr_t data) NVGetPCIXpressChip(dev) : dev->vendor_id << 16 | dev->device_id; const char *name = xf86TokenToString(NVKnownChipsets, id); + if (pci_device_has_kernel_driver(dev)) { + ErrorF("The PCI device has a kernel module claiming it.\n"); + ErrorF("This driver cannot operate until it has been unloaded\n"); + return FALSE; + } + if(dev->vendor_id == PCI_VENDOR_NVIDIA && !name && !NVIsSupported(id) && !NVIsG80(id)) { /* See if pci.ids knows what the heck this thing is */ -- cgit v1.2.3