diff options
author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-10-08 22:40:44 +0000 |
---|---|---|
committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-10-08 22:40:44 +0000 |
commit | f7a97ec991ce079171c212a77578eb52b03437b8 (patch) | |
tree | 04fe995b72c13b08f32379b6767351eef8cf420b /xserver/hw/xfree86 | |
parent | 7e69ad5d00c9a8e5fa4bf3c9be4c91f9907db86f (diff) |
Fix bad merge that changed an fcntl() into a priv_open_device().
Should fix mouse re-open after VT-switch
Diffstat (limited to 'xserver/hw/xfree86')
-rw-r--r-- | xserver/hw/xfree86/os-support/shared/posix_tty.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/xserver/hw/xfree86/os-support/shared/posix_tty.c b/xserver/hw/xfree86/os-support/shared/posix_tty.c index 7491d3410..ff3724f78 100644 --- a/xserver/hw/xfree86/os-support/shared/posix_tty.c +++ b/xserver/hw/xfree86/os-support/shared/posix_tty.c @@ -128,7 +128,7 @@ xf86OpenSerial(XF86OptionPtr options) #ifndef X_PRIVSEP SYSCALL(fd = open(dev, O_RDWR | O_NONBLOCK)); #else - fd = priv_open_device (dev); + fd = priv_open_device (dev); #endif if (fd == -1) { xf86Msg(X_ERROR, @@ -166,11 +166,7 @@ xf86OpenSerial(XF86OptionPtr options) return -1; } -#ifndef X_PRIVSEP SYSCALL(i = fcntl(fd, F_GETFL, 0)); -#else - fd = priv_open_device (dev); -#endif if (i == -1) { SYSCALL(close(fd)); free(dev); |