xf86-video-intel: src/intel_device.c

Chris Wilson ickle at kemper.freedesktop.org
Sat Feb 15 01:02:05 CET 2014


 src/intel_device.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5601f8cc330fe88eadfa7238659c5abb223e3b28
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Sat Feb 15 00:02:35 2014 +0100

    intel: Fix fd_set_nonblock
    
    O_NONBLOCK is a status flag not a descriptor flag, so F_GETFL / F_SETFL should
    be used to modify it.
    
    Signed-off-by: Hans de Goede <hdegoede at redhat.com>

diff --git a/src/intel_device.c b/src/intel_device.c
index 8fd7882..e6fda19 100644
--- a/src/intel_device.c
+++ b/src/intel_device.c
@@ -167,10 +167,10 @@ static int fd_set_nonblock(int fd)
 	if (fd == -1)
 		return fd;
 
-	flags = fcntl(fd, F_GETFD);
+	flags = fcntl(fd, F_GETFL);
 	if (flags != -1) {
 		flags |= O_NONBLOCK;
-		fcntl(fd, F_SETFD, flags);
+		fcntl(fd, F_SETFL, flags);
 	}
 
 	return fd;


More information about the xorg-commit mailing list