hal/hald callout.c,1.12,1.13

[David Zeuthen]

Update of /cvs/hal/hal/hald
In directory pdx:/tmp/cvs-serv21930/hald

Modified Files:
	callout.c 
Log Message:
2004-05-01  David Zeuthen  <david at fubar.dk>

	* hald/callout.c (iochn_data): remember to remove element from 
	active_callouts list

	* hald/linux/class_device.c (class_device_detection_done): remove



Index: callout.c
===================================================================
RCS file: /cvs/hal/hal/hald/callout.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- a/callout.c	1 May 2004 19:29:17 -0000	1.12
+++ b/callout.c	1 May 2004 19:46:41 -0000	1.13
@@ -222,14 +222,18 @@
 				break;
 			}
 		}
-	
+
 		if (callout == NULL) {
 			/* this should never happen */
 			HAL_ERROR (("Cannot find callout for terminated "
 				    "child with pid %d", child_pid));
 			goto out;
 		}
-	
+
+
+		/* remove element from active_callouts list */
+		active_callouts = g_slist_delete_link (active_callouts,
+							       it);
 
 		if (callout->last_of_device)
 			hal_device_callouts_finished (callout->device);