diff options
| author | Colin Cross <ccross@android.com> | 2013-12-30 18:08:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-30 18:08:59 +0000 |
| commit | dab375bcba96315af1e388dcaa9c9b92c4a81248 (patch) | |
| tree | 63b18b6ad844c0a76254354c26d2c7304d68d4b0 | |
| parent | 3dd470552c6b1c88cd344c3a366666ba464bd994 (diff) | |
| parent | 764daa33c06b5fd699bf0c8162b18dd39b00795a (diff) | |
| download | system_core-dab375bcba96315af1e388dcaa9c9b92c4a81248.zip system_core-dab375bcba96315af1e388dcaa9c9b92c4a81248.tar.gz system_core-dab375bcba96315af1e388dcaa9c9b92c4a81248.tar.bz2 | |
am 764daa33: am 21ff8257: am bb96da43: am 268cc540: Merge "ueventd: fix a busy loop while reading uevents"
* commit '764daa33c06b5fd699bf0c8162b18dd39b00795a':
ueventd: fix a busy loop while reading uevents
| -rw-r--r-- | init/init.c | 2 | ||||
| -rw-r--r-- | init/ueventd.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/init/init.c b/init/init.c index 365726c..ab52749 100644 --- a/init/init.c +++ b/init/init.c @@ -1132,7 +1132,7 @@ int main(int argc, char **argv) continue; for (i = 0; i < fd_count; i++) { - if (ufds[i].revents == POLLIN) { + if (ufds[i].revents & POLLIN) { if (ufds[i].fd == get_property_set_fd()) handle_property_set_fd(); else if (ufds[i].fd == get_keychord_fd()) diff --git a/init/ueventd.c b/init/ueventd.c index a41c31e..3d01836 100644 --- a/init/ueventd.c +++ b/init/ueventd.c @@ -94,7 +94,7 @@ int ueventd_main(int argc, char **argv) nr = poll(&ufd, 1, -1); if (nr <= 0) continue; - if (ufd.revents == POLLIN) + if (ufd.revents & POLLIN) handle_device_fd(); } } |