diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-08-19 15:06:11 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-08-19 15:06:11 -0400 |
| commit | b1f2c7a89ace1f6e5750783f3c43c4c5a6d24374 (patch) | |
| tree | f0e2c316819f3b3bafc9edc7a0e67bdbfe002a8d | |
| parent | af5125968a738ec8f496d04eb65acb7c8f812115 (diff) | |
The ->Identify hook is not mandatory.
Best comment ever though. Mad props.
| -rw-r--r-- | hw/xfree86/common/xf86Init.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 0db67762f..9a9ec3403 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -716,14 +716,10 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) for (i = 0; i < xf86NumDrivers; i++) { xorgHWFlags flags; - /* The Identify function is mandatory, but if it isn't there continue */ + if (xf86DriverList[i]->Identify != NULL) xf86DriverList[i]->Identify(0); - else { - xf86Msg(X_WARNING, "Driver `%s' has no Identify function\n", - xf86DriverList[i]->driverName ? xf86DriverList[i]->driverName - : "noname"); - } + if (!xorgHWAccess && (!xf86DriverList[i]->driverFunc || !xf86DriverList[i]->driverFunc(NULL, |