drm: Branch 'master'

 xf86drm.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f34b6942ec5fd7ee3724576b8ee962c2553aad24
Author: Kevin Strasser <[email protected]>
Date:   Fri May 18 12:48:17 2018 -0700

    xf86drm: Be sure to closedir before return
    
    removed in commit bb45ce4e3ac751315bfd7fbfd9e1425bf515ec0d
    
    Adding it back as it is still needed in the case where we don't find a
    match.
    
    Signed-off-by: Kevin Strasser <[email protected]>
    Fixes: bb45ce4e3ac751315bfd "libdrm: Use readdir instead of readdir_r to
                                 avoid build warnings"$
    Reviewed-by: Eric Engestrom <[email protected]>

diff --git a/xf86drm.c b/xf86drm.c
index 3a9d0ed2..056dfa49 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -2855,6 +2855,8 @@ static char *drmGetMinorNameForFD(int fd, int type)
             return strdup(dev_name);
         }
     }
+
+    closedir(sysdir);
     return NULL;
 #else
     struct stat sbuf;

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