xserver pixman libX11 libXext 14/11/2010

1 files changed, 1 insertions, 5 deletions

diff --git a/xorg-server/config/hal.c b/xorg-server/config/hal.c
index 5ce7d7d48..dab35ddf7 100644
--- a/xorg-server/config/hal.c
+++ b/xorg-server/config/hal.c
@@ -376,6 +376,7 @@ device_added(LibHalContext *hal_ctx, const char *udi)
         add_option(&options, "xkb_model", xkb_opts.model);

     if (xkb_opts.options)

         add_option(&options, "xkb_options", xkb_opts.options);

+    add_option(&options, "config_info", config_info);

 

     /* this isn't an error, but how else do you output something that the user can see? */

     LogMessage(X_INFO, "config/hal: Adding input device %s\n", name);

@@ -385,11 +386,6 @@ device_added(LibHalContext *hal_ctx, const char *udi)
         goto unwind;

     }

 

-    for (; dev; dev = dev->next){

-        free(dev->config_info);

-        dev->config_info = strdup(config_info);

-    }

-

 unwind:

     if (set)

         libhal_free_property_set(set);