diff options
authorAaron Plattner <>2010-06-02 16:06:40 -0700
committerAaron Plattner <>2010-06-15 14:59:25 -0700
commit0f220eb6934edc9a1d2d7d8c11573cdc8a9280e3 (patch)
parent4e1efd5222ffb8328b12f63e4d8083298b44dd17 (diff)
Fix the kernel driver error reporting to be a little more verbose.
Commit 3e9f7704122e0685ce83f7d3d3630e8a07293671 added printouts when the driver detects that a kernel module is attached to the given PCI device. However, it uses ErrorF and doesn't print any identifying information about *which* device has the problem or even which driver is complaining. Fix it to use xf86DrvMsg and print the driver name and PCI device and bus IDs. Signed-off-by: Aaron Plattner <>
1 files changed, 6 insertions, 3 deletions
diff --git a/src/nv_driver.c b/src/nv_driver.c
index d77ea2e..f370134 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -841,9 +841,12 @@ NVPciProbe(DriverPtr drv, int entity, struct pci_device *dev, intptr_t data)
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;
+ xf86DrvMsg(0, X_ERROR,
+ NV_NAME ": The PCI device 0x%x (%s) at %2.2x@%2.2x:%2.2x:%1.1x has a kernel module claiming it.\n",
+ id, name, dev->bus, dev->domain, dev->dev, dev->func);
+ xf86DrvMsg(0, X_ERROR,
+ NV_NAME ": This driver cannot operate until it has been unloaded.\n");
+ return FALSE;
if(dev->vendor_id == PCI_VENDOR_NVIDIA && !name &&