xf86-video-intel: src/intel_device.c

Chris Wilson ickle at kemper.freedesktop.org
Tue Feb 28 20:53:01 UTC 2017


 src/intel_device.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 78d7a09b0343829c81257024b164b0b3764392ac
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Feb 28 20:48:43 2017 +0000

    intel: Fix checking xf86LoadKernelModule for success
    
    Originally introduced in
    
    commit f66e25def3431a900068cc1c23a6b1e8322ef046
    Author: Chris Wilson <chris at chris-wilson.co.uk>
    Date:   Mon Jun 23 16:14:28 2014 +0100
    
        intel: Wait for the DRM device to load
    
    the legacy path was checking the return xf86LoadKernelModule
    incorrectly. This error was then copy into the common loader in
    
    commit 6a2dcb388e6b549c3175ccfbcd3f1751e25de40a
    Author: Chris Wilson <chris at chris-wilson.co.uk>
    Date:   Fri Jul 31 10:40:32 2015 +0100
    
        intel: Refactor i915.ko loading support
    
    xf86LoadKernelModule() returns 1 on success and zero on failure.
    
    Reported-by: David Shao <davshao at gmail.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100011
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_device.c b/src/intel_device.c
index 04ad7b6..c4910cd 100644
--- a/src/intel_device.c
+++ b/src/intel_device.c
@@ -233,7 +233,7 @@ static int load_i915_kernel_module(void)
 	const char **kn;
 
 	for (kn = kernel_module_names; *kn; kn++)
-		if (xf86LoadKernelModule(*kn) == 0)
+		if (xf86LoadKernelModule(*kn))
 			return 0;
 
 	return -1;


More information about the xorg-commit mailing list