openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

* commit '268cc54089cbdeb0c2ea955448bb16a0858c4538':
  ueventd: fix a busy loop while reading uevents
This commit is contained in:
Colin Cross 2013-12-28 12:13:22 -08:00 committed by Android Git Automerger
parent 6604f2d1ef 268cc54089
commit bb96da432b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
init/init.c
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())

2
init/ueventd.c
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();
}
}