diff options
| author | Elliott Hughes <enh@google.com> | 2014-12-03 18:38:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-03 18:38:05 +0000 |
| commit | 023bc0a426d0500904d5a9d2ddf4b7dfecf9ce6a (patch) | |
| tree | c53c5d130644eb88a14d46de2774e64d0f905d34 | |
| parent | bc2602068d83b0226a614ed143cebd708c5fabd2 (diff) | |
| parent | cdb1b1b84daa528d078379a7f343177b94e5976e (diff) | |
| download | system_core-023bc0a426d0500904d5a9d2ddf4b7dfecf9ce6a.zip system_core-023bc0a426d0500904d5a9d2ddf4b7dfecf9ce6a.tar.gz system_core-023bc0a426d0500904d5a9d2ddf4b7dfecf9ce6a.tar.bz2 | |
Merge "Fix deadlocks."
| -rw-r--r-- | adb/framebuffer_service.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 @@ void framebuffer_service(int fd, void *cookie) exit(1); } + close(fds[1]); fd_screencap = fds[0]; /* read w, h & format */ @@ -173,10 +174,9 @@ void framebuffer_service(int fd, void *cookie) } done: - TEMP_FAILURE_RETRY(waitpid(pid, NULL, 0)); - close(fds[0]); - close(fds[1]); + + TEMP_FAILURE_RETRY(waitpid(pid, NULL, 0)); pipefail: close(fd); } |