xf86-video-intel: Branch 'dri2-swapbuffers' - src/drmmode_display.c

[Kristian Høgsberg]

 src/drmmode_display.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 35d6c90a1d4d8b8daa5034426af7578e194a8f8b
Author: Kristian Høgsberg <krh at redhat.com>
Date:   Thu Jul 23 03:15:04 2009 -0400

    Ok, only check fd_set when err is non-negative

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 1e5eb08..f527c39 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1187,14 +1187,8 @@ drm_wakeup_handler(pointer data, int err, pointer p)
 {
     drmmode_ptr drmmode = data;
     fd_set *read_mask = p;
-    struct pollfd pf[1];
 
-    /* FIXME: Why does the select read mask lie? */
-    pf[0].fd = drmmode->fd;
-    pf[0].events = POLLIN;
-    poll(pf, 1, 0);
-
-    if (pf[0].revents & POLLIN)
+    if (err >= 0 && FD_ISSET(drmmode->fd, read_mask))
 	drmHandleEvent(drmmode->fd, &drmmode->event_context);
 }