[PATCH] xfree86: duplicate name and driver from pInfo for NewInputDeviceRequest

Peter Hutterer peter.hutterer at who-t.net
Mon Oct 31 19:22:17 PDT 2011

xorg.conf devices had the name and driver set in the DDX's InputInfoPtr list
but not in the option list for those devices. That information was lost when
passing the options into NewInputDeviceRequest. NIDR then refused to start
the devices.

Introduced in xorg-server-1.11.0-250-ge4cd24e

Reported-by: James Cloos <cloos at jhcloos.com>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
 hw/xfree86/common/xf86Init.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index a0fdf29..c1e48ee 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -827,6 +827,8 @@ InitInput(int argc, char **argv)
     /* Initialize all configured input devices */
     for (pInfo = xf86ConfigLayout.inputs; pInfo && *pInfo; pInfo++) {
+        (*pInfo)->options = xf86AddNewOption((*pInfo)->options, "driver", (*pInfo)->driver);
+        (*pInfo)->options = xf86AddNewOption((*pInfo)->options, "identifier", (*pInfo)->name);
         /* If one fails, the others will too */
         if (NewInputDeviceRequest((*pInfo)->options, NULL, &dev) == BadAlloc)

More information about the xorg-devel mailing list