hal: Branch 'master' - 2 commits

[Joe Marcus Clarke]

 hald/freebsd/hf-util.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c19958b92d0ae8373988d828f4e6521e4d584f8c
Merge: ef36a70... f6f3a6b...
Author: Joe Marcus Clarke <marcus at FreeBSD.org>
Date:   Sat Feb 2 21:08:30 2008 -0500

    Merge branch 'master' of ssh://marcus@git.freedesktop.org/git/hal

commit ef36a70ef6de8b718ee7121228e5b6e258dcbc71
Author: Joe Marcus Clarke <marcus at FreeBSD.org>
Date:   Sat Feb 2 21:08:10 2008 -0500

    call callouts after FDI mapping is complete
    
    Make sure that add callouts are executed AFTER the FDI policy and information
    data has been applied.

diff --git a/hald/freebsd/hf-util.c b/hald/freebsd/hf-util.c
index 86870b3..8d6b07f 100644
--- a/hald/freebsd/hf-util.c
+++ b/hald/freebsd/hf-util.c
@@ -147,15 +147,15 @@ hf_device_add (HalDevice *device)
 
   g_return_if_fail(HAL_IS_DEVICE(device));
 
+  /* process information and policy fdi files */
+  di_search_and_merge(device, DEVICE_INFO_TYPE_INFORMATION);
+  di_search_and_merge(device, DEVICE_INFO_TYPE_POLICY);
+
   /* run add callouts */
   hf_async_init(&async);
   hal_util_callout_device_add(device, hf_device_callout_done_cb, &async, NULL);
   hf_async_wait(&async);
 
-  /* process information and policy fdi files */
-  di_search_and_merge(device, DEVICE_INFO_TYPE_INFORMATION);
-  di_search_and_merge(device, DEVICE_INFO_TYPE_POLICY);
-  
   /* move from temporary to global device store */
   hal_device_store_remove(hald_get_tdl(), device);
   hal_device_store_add(hald_get_gdl(), device);