summaryrefslogtreecommitdiffstats
path: root/adb
diff options
context:
space:
mode:
authorJP Abgrall <jpa@google.com>2014-03-11 18:42:20 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-11 18:42:20 +0000
commit40b735f9b952fd00d890a3c0689b0f694fc9211b (patch)
tree41ae769acbb3fd74b7f8c8eb44786b00673e81ed /adb
parenta4a9e64668ce1980e7c39e476aee89b106f6517a (diff)
parent1367854a891090d1be1edfb12515691b20b350cf (diff)
downloadsystem_core-40b735f9b952fd00d890a3c0689b0f694fc9211b.zip
system_core-40b735f9b952fd00d890a3c0689b0f694fc9211b.tar.gz
system_core-40b735f9b952fd00d890a3c0689b0f694fc9211b.tar.bz2
am 1367854a: Merge "adb: fix windows build after "forward --list" fix."
* commit '1367854a891090d1be1edfb12515691b20b350cf': adb: fix windows build after "forward --list" fix.
Diffstat (limited to 'adb')
-rw-r--r--adb/transport.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/adb/transport.c b/adb/transport.c
index 58f685c..f35880c 100644
--- a/adb/transport.c
+++ b/adb/transport.c
@@ -1188,7 +1188,7 @@ int writex(int fd, const void *ptr, size_t len)
D("writex: fd=%d error %d: %s\n", fd, errno, strerror(errno));
if (errno == EINTR)
continue;
- if (errno == EAGAIN || errno == EWOULDBLOCK) {
+ if (errno == EAGAIN) {
adb_sleep_ms(1); // just yield some cpu time
continue;
}