commit 023bc0a426d0500904d5a9d2ddf4b7dfecf9ce6a
author Elliott Hughes <enh@google.com> Wed Dec 03 18:38:04 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 03 18:38:05 2014 +0000
tree c53c5d130644eb88a14d46de2774e64d0f905d34
parent bc2602068d83b0226a614ed143cebd708c5fabd2
parent cdb1b1b84daa528d078379a7f343177b94e5976e

Merge "Fix deadlocks."

adb/framebuffer_service.c

diff --git a/adb/framebuffer_service.c b/adb/framebuffer_service.c
index 8cbe840..61578aa 100644
--- a/adb/framebuffer_service.c
+++ b/adb/framebuffer_service.c
@@ -76,6 +76,7 @@
         exit(1);
     }
 
+    close(fds[1]);
     fd_screencap = fds[0];
 
     /* read w, h & format */
@@ -173,10 +174,9 @@
     }
 
 done:
-    TEMP_FAILURE_RETRY(waitpid(pid, NULL, 0));
-
     close(fds[0]);
-    close(fds[1]);
+
+    TEMP_FAILURE_RETRY(waitpid(pid, NULL, 0));
 pipefail:
     close(fd);
 }