xserver: Branch 'master'

[Dodji Seketeli]

 hw/kdrive/linux/tslib.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 14c13b8d62eb37cba8a044daffcddec578ba1644 (from 026534f945ae5652592a090a9d41375ca37ab618)
Author: Dave Jones <davej at redhat.com>
Date:   Thu Aug 16 09:46:27 2007 +0200

    Kdrive: fix nasty thinko in TslibEnable()

diff --git a/hw/kdrive/linux/tslib.c b/hw/kdrive/linux/tslib.c
index 41b74fa..371aece 100644
--- a/hw/kdrive/linux/tslib.c
+++ b/hw/kdrive/linux/tslib.c
@@ -118,7 +118,7 @@ TslibEnable (KdPointerInfo *pi)
     private->fd = ts_fd(private->tsDev);
     if (!private->tsDev || ts_config(private->tsDev) || private->fd < 0) {
         ErrorF("[tslib/TslibEnable] failed to open %s\n", pi->path);
-        if (private->fd > 0);
+        if (private->fd >= 0)
             close(private->fd);
         return BadAlloc;
     }