commit 6f5096b1885459bc0818c7634ba33c03e455dc7b
author Colin Cross <ccross@android.com> Thu Jun 03 14:45:19 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 03 14:45:19 2010 -0700
tree 6e88b7697fa15417c019f600217e536ce01ea41c
parent 2ddc27d0df310a21d96a998151933fab6b2e156d
parent 982a815c10cc28707d81c46112fc45b1c10df3be

am 982a815c: Reap firmware child processes to prevent zombies

init/devices.c

diff --git a/init/devices.c b/init/devices.c
index 663cdfe..155a41e 100644
--- a/init/devices.c
+++ b/init/devices.c
@@ -31,6 +31,7 @@
 #include <private/android_filesystem_config.h>
 #include <sys/time.h>
 #include <asm/page.h>
+#include <sys/wait.h>
 
 #include "devices.h"
 #include "util.h"
@@ -537,6 +538,8 @@
 static void handle_firmware_event(struct uevent *uevent)
 {
     pid_t pid;
+    int status;
+    int ret;
 
     if(strcmp(uevent->subsystem, "firmware"))
         return;
@@ -549,6 +552,10 @@
     if (!pid) {
         process_firmware_event(uevent);
         exit(EXIT_SUCCESS);
+    } else {
+        do {
+            ret = waitpid(pid, &status, 0);
+        } while (ret == -1 && errno == EINTR);
     }
 }