hal/hald/linux2 hotplug.c,1.14,1.15 physdev.c,1.10,1.11

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux2
In directory gabe:/tmp/cvs-serv30228/hald/linux2

Modified Files:
	hotplug.c physdev.c 
Log Message:
2005-03-15  David Zeuthen  <david at fubar.dk>

	* doc/TODO (CVSID): Add a few items



Index: hotplug.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/hotplug.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- hotplug.c	28 Feb 2005 04:53:15 -0000	1.14
+++ hotplug.c	15 Mar 2005 21:10:06 -0000	1.15
@@ -146,6 +146,13 @@
 		sys_block_path_len   = g_snprintf (sys_block_path, HAL_PATH_MAX, "%s/block", get_hal_sysfs_path ());
 	}
 
+	if (hotplug_event->is_add && hal_device_store_match_key_value_string (hald_get_gdl (),
+									      "linux.sysfs_path",
+									      hotplug_event->sysfs.sysfs_path)) {
+		HAL_ERROR (("devpath %s already present in the store, ignore event", hotplug_event->sysfs.sysfs_path));
+		hotplug_event_end ((void *) hotplug_event);
+		return;
+	}
 
 	if (strncmp (hotplug_event->sysfs.sysfs_path, sys_devices_path, sys_devices_path_len) == 0) {		
 		if (hotplug_event->is_add) {

Index: physdev.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/physdev.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- physdev.c	28 Feb 2005 04:53:15 -0000	1.10
+++ physdev.c	15 Mar 2005 21:10:06 -0000	1.11
@@ -319,7 +319,8 @@
 		hal_device_property_set_string (d, "info.bus", "usb");
 
 		/* take all usb_device.* properties from parent and make them usb.* on this object */
-		hal_device_merge_with_rewrite (d, parent, "usb.", "usb_device.");
+		if (parent)
+			hal_device_merge_with_rewrite (d, parent, "usb.", "usb_device.");
 
 		hal_device_property_set_string (d, "usb.linux.sysfs_path", sysfs_path);