From: Jaroslav Kysela <perex@perex.cz>
Date: Sun, 10 Dec 2017 14:55:14 +0000 (+0100)
Subject: tvhpoll: return correct fd in tvhpoll_wait() for linux's epoll
X-Git-Tag: v4.2.5~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7ca59a1ff591fec1c31430ed2daab04bfe5fb81;p=thirdparty%2Ftvheadend.git

tvhpoll: return correct fd in tvhpoll_wait() for linux's epoll
---

diff --git a/src/tvhpoll.c b/src/tvhpoll.c
index a12dcfd07..64c5aa0be 100644
--- a/src/tvhpoll.c
+++ b/src/tvhpoll.c
@@ -174,6 +174,7 @@ int tvhpoll_wait
 #if ENABLE_EPOLL
   nfds = epoll_wait(tp->fd, tp->ev, num, ms);
   for (i = 0; i < nfds; i++) {
+    evs[i].fd       = tp->ev[i].data.fd;
     evs[i].data.u64 = tp->ev[i].data.u64;
     evs[i].events   = 0;
     if (tp->ev[i].events & EPOLLIN)  evs[i].events |= TVHPOLL_IN;