| commit | 6ac52a6b02d0eb17d469b9887e0b3ba707b856a5 | [log] [tgz] |
|---|---|---|
| author | Yabin Cui <yabinc@google.com> | Thu Aug 27 22:06:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 22:06:51 2015 +0000 |
| tree | b0c9f5edc2b0e831b2e61b93896b5b1a5797ce0a | |
| parent | 4f2afd84fd88bf6d00df0bd26e25f775f0877dc1 [diff] | |
| parent | 84a4eb5628168a94e224ab0424680ad6c5649c6a [diff] |
am f6cee89b: am 9f91681d: am f3068123: Merge "adb: fix a fake data race on transport:kick reported by tsan." * commit 'f6cee89b638acb53413e4cb9db1c19eac5cf3c97': adb: fix a fake data race on transport:kick reported by tsan.
diff --git a/adb/transport.cpp b/adb/transport.cpp index 5e4ffbb..20d5d71 100644 --- a/adb/transport.cpp +++ b/adb/transport.cpp
@@ -43,7 +43,7 @@ void kick_transport(atransport* t) { - if (t && !t->kicked) + if (t != nullptr) { int kicked;