mainnika
/
weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

launcher: Fix reverted sense of drm_check_master() wrapper

Browse Source 
Also rename to drm_is_master() to make it clearer what we're checking.

https://bugs.freedesktop.org/show_bug.cgi?id=70459
dev
Kristian Høgsberg 12 years ago
parent e14aa4f0a9
commit 876c75f1fa
1 changed files with 5 additions and 5 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      src/launcher-util.c

10
src/launcher-util.c
Unescape View File

@ -81,18 +81,18 @@ drm_set_master(int drm_fd)
return -EBADF; return -EBADF;
} }
static int static int
drm_check_master(int drm_fd) drm_is_master(int drm_fd)
{ {
drm_magic_t magic; drm_magic_t magic;
if (drm_fd != -1) if (drm_fd != -1)
return drmGetMagic(drm_fd, &magic) != 0 || return drmGetMagic(drm_fd, &magic) == 0 &&
drmAuthMagic(drm_fd, magic) != 0; drmAuthMagic(drm_fd, magic) == 0;
return 0; return 0;
} }
#else #else
static int drm_drop_master(int drm_fd) {return 0;} static int drm_drop_master(int drm_fd) {return 0;}
static int drm_set_master(int drm_fd) {return 0;} static int drm_set_master(int drm_fd) {return 0;}
static int drm_check_master(int drm_fd) {return 1;} static int drm_is_master(int drm_fd) {return 1;}
#endif #endif
int int
@ -121,7 +121,7 @@ weston_launcher_open(struct weston_launcher *launcher,
if (major(s.st_rdev) == DRM_MAJOR) { if (major(s.st_rdev) == DRM_MAJOR) {
launcher->drm_fd = fd; launcher->drm_fd = fd;
if (!drm_check_master(fd)) { if (!drm_is_master(fd)) {
weston_log("drm fd not master\n"); weston_log("drm fd not master\n");
close(fd); close(fd);
return -1; return -1;

Write Preview
Loading…
Cancel
Save