commit 268cc54089cbdeb0c2ea955448bb16a0858c4538
author Colin Cross <ccross@android.com> Sat Dec 28 20:09:52 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Dec 28 20:09:53 2013 +0000
tree 782c5c42929926dfa806fa3b410bfbad3c35b3b5
parent 2dcc275936aefbb5badf3b4822d492260077144d
parent 1d4e86c44589b3a97ca0113493c2e569c3aabcc6

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