Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dab375bc authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

am 764daa33: am 21ff8257: am bb96da43: am 268cc540: Merge "ueventd: fix a busy... 

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

* commit '764daa33':
  ueventd: fix a busy loop while reading uevents
parents 3dd47055 764daa33

init/init.c

+1 −1
Original line number Diff line number Diff line
@@ -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())

init/ueventd.c

+1 −1
Original line number Diff line number Diff line
@@ -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();

    }

}