am 21ff8257: am bb96da43: am 268cc540: Merge "ueventd: fix a busy loop while reading uevents"

* commit '21ff8257c6ea4af11ab29553bad96ff3a87ba224':
  ueventd: fix a busy loop while reading uevents
This commit is contained in:
Colin Cross 2013-12-28 20:19:21 +00:00 committed by Android Git Automerger
commit 764daa33c0
2 changed files with 2 additions and 2 deletions

View File

@ -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())

View File

@ -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();
}
}