xf86-video-intel: 2 commits - src/intel_device.c src/intel_module.c
Chris Wilson
ickle at kemper.freedesktop.org
Tue Mar 11 03:07:38 PDT 2014
src/intel_device.c | 3 +++
src/intel_module.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit dd1ff3230292a31d366c96b97711d7df97362093
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Tue Mar 11 10:06:24 2014 +0000
intel: Protect against a NULL platform device with server fd
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/intel_device.c b/src/intel_device.c
index bd66ae6..8780469 100644
--- a/src/intel_device.c
+++ b/src/intel_device.c
@@ -263,6 +263,9 @@ static char *get_path(struct xf86_platform_device *dev)
#if defined(ODEV_ATTRIB_FD)
static int get_fd(struct xf86_platform_device *dev)
{
+ if (dev == NULL)
+ return -1;
+
return xf86_get_platform_device_int_attrib(dev, ODEV_ATTRIB_FD, -1);
}
commit 59f2f4885dbead3f2aece668f48c3ac749f724c2
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Tue Mar 11 10:00:27 2014 +0000
intel: Fix versioning of SUPPORTS_SERVER_FD
The current snapshot is 1.15.99.901, which means that the new feature
will first be available in 1.15.99.902.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/intel_module.c b/src/intel_module.c
index 75860be..7f31a94 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -420,7 +420,7 @@ static Bool intel_driver_func(ScrnInfoPtr pScrn,
return TRUE;
-#if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(1,15,99,902,0)
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,99,902,0)
case SUPPORTS_SERVER_FDS:
return TRUE;
#endif
More information about the xorg-commit
mailing list