diff options
author | Jakob Bornecrantz <jakob@vmware.com> | 2010-01-05 20:59:24 +0100 |
---|---|---|
committer | Jakob Bornecrantz <jakob@vmware.com> | 2010-01-05 20:59:24 +0100 |
commit | 2f7f7ceccab4176217c399502b3ff95df1517627 (patch) | |
tree | 1a9f6e6c8ebcf5b13d9877685fce91b87a971ed2 /xf86drm.c | |
parent | d6059c3dd1300662e941ccd5e55649534fbb9a63 (diff) | |
parent | 6d3b8bbddd44b42d89adb1aafb7645e7f802673a (diff) |
Merge branch 'master' into libkms-master
Conflicts:
configure.ac
Diffstat (limited to 'xf86drm.c')
-rw-r--r-- | xf86drm.c | 11 |
1 files changed, 2 insertions, 9 deletions
@@ -2492,19 +2492,12 @@ void drmCloseOnce(int fd) int drmSetMaster(int fd) { - int ret; - - fprintf(stderr,"Setting master \n"); - ret = ioctl(fd, DRM_IOCTL_SET_MASTER, 0); - return ret; + return ioctl(fd, DRM_IOCTL_SET_MASTER, 0); } int drmDropMaster(int fd) { - int ret; - fprintf(stderr,"Dropping master \n"); - ret = ioctl(fd, DRM_IOCTL_DROP_MASTER, 0); - return ret; + return ioctl(fd, DRM_IOCTL_DROP_MASTER, 0); } char *drmGetDeviceNameFromFd(int fd) |