diff options
| author | marha <marha@users.sourceforge.net> | 2014-04-13 14:28:06 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-04-13 14:28:06 +0200 |
| commit | 0bd141efd4832e01c8b269b8566dd5749e30ed55 (patch) | |
| tree | cdad95c688236c6e2e36f13a3495c498393dabc8 /mesalib/src/loader/loader.c | |
| parent | feab85024204c7db3ad243697fe06bf3960349a9 (diff) | |
| parent | d2ad10d03be8e6d4b150bbdf2a28ea3d5a18a2ed (diff) | |
| download | vcxsrv-0bd141efd4832e01c8b269b8566dd5749e30ed55.tar.gz vcxsrv-0bd141efd4832e01c8b269b8566dd5749e30ed55.tar.bz2 vcxsrv-0bd141efd4832e01c8b269b8566dd5749e30ed55.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/loader/loader.c')
| -rw-r--r-- | mesalib/src/loader/loader.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/loader/loader.c b/mesalib/src/loader/loader.c index e343f4a57..666d0158a 100644 --- a/mesalib/src/loader/loader.c +++ b/mesalib/src/loader/loader.c @@ -202,7 +202,7 @@ out: return (*chip_id >= 0); } -#elif defined(ANDROID) && !defined(__NOT_HAVE_DRM_H) +#elif !defined(__NOT_HAVE_DRM_H) /* for i915 */ #include <i915_drm.h> @@ -219,12 +219,12 @@ loader_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id) version = drmGetVersion(fd); if (!version) { log_(_LOADER_WARNING, "MESA-LOADER: invalid drm fd\n"); - return FALSE; + return 0; } if (!version->name) { log_(_LOADER_WARNING, "MESA-LOADER: unable to determine the driver name\n"); drmFreeVersion(version); - return FALSE; + return 0; } if (strcmp(version->name, "i915") == 0) { |