commit 21ff8257c6ea4af11ab29553bad96ff3a87ba224
author Colin Cross <ccross@android.com> Sat Dec 28 20:16:15 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Dec 28 20:16:15 2013 +0000
tree 8353cae7ed8de4536e2cd68871290a20214c8da7
parent fed48bb6de631402876f246d47d87ea1255e83d0
parent bb96da432b129cfa2a680910cda00b6c469caeee

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

* commit 'bb96da432b129cfa2a680910cda00b6c469caeee':
  ueventd: fix a busy loop while reading uevents

init/init.c

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

init/ueventd.c

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 @@
         nr = poll(&ufd, 1, -1);
         if (nr <= 0)
             continue;
-        if (ufd.revents == POLLIN)
+        if (ufd.revents & POLLIN)
                handle_device_fd();
     }
 }