drm: Branch 'master'

 xf86drm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a2fa2e08692483cf9f4d06caa6e0f0add59e3343
Author: Adam Jackson <[email protected]>
Date:   Thu May 4 15:57:14 2017 -0400

    Fix stray caller of drmCompareDevices
    
    Signed-off-by: Adam Jackson <[email protected]>

diff --git a/xf86drm.c b/xf86drm.c
index 29fea331..728ac78c 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -3669,7 +3669,7 @@ static void drmFoldDuplicatedDevices(drmDevicePtr local_devices[], int count)
 
     for (i = 0; i < count; i++) {
         for (j = i + 1; j < count; j++) {
-            if (drmCompareDevices(local_devices[i], local_devices[j])) {
+            if (drmDevicesEqual(local_devices[i], local_devices[j])) {
                 local_devices[i]->available_nodes |= local_devices[j]->available_nodes;
                 node_type = log2(local_devices[j]->available_nodes);
                 memcpy(local_devices[i]->nodes[node_type],

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
--