projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
st/nine: Fix CND implementation
[mesa.git]
/
src
/
loader
/
loader.c
diff --git
a/src/loader/loader.c
b/src/loader/loader.c
index 47e1f58746ce6c4ded590783524919026ce3bb16..94c993ac8415c1449f873ecab17d94bd3cf66da2 100644
(file)
--- a/
src/loader/loader.c
+++ b/
src/loader/loader.c
@@
-402,7
+402,7
@@
int loader_get_user_preferred_fd(int default_fd, int *different_device)
}
fd = drm_open_device(device_name);
}
fd = drm_open_device(device_name);
- if (fd > 0) {
+ if (fd >
=
0) {
close(default_fd);
} else {
fd = default_fd;
close(default_fd);
} else {
fd = default_fd;
@@
-594,6
+594,9
@@
libudev_get_device_name_for_fd(int fd)
(struct udev_device *));
UDEV_SYMBOL(struct udev *, udev_unref, (struct udev *));
(struct udev_device *));
UDEV_SYMBOL(struct udev *, udev_unref, (struct udev *));
+ if (dlsym_failed)
+ return NULL;
+
udev = udev_new();
device = udev_device_new_from_fd(udev, fd);
if (device == NULL)
udev = udev_new();
device = udev_device_new_from_fd(udev, fd);
if (device == NULL)