commit 09d7d5993e75e22ade6b37bc98c42d30a81ec6af
author Jason Sams <jsams@google.com> Thu Oct 09 12:50:19 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 09 12:50:19 2014 +0000
tree 648f0d77a91dad4361042d975f3154d945287a4e
parent 3e8d240af4e4b77d1a4903548c3757cbc15420a5
parent c214fe59fc48740ed003a3cde4e5a60517c5d5ce

am c214fe59: Fix incorrect error check for mmap

* commit 'c214fe59fc48740ed003a3cde4e5a60517c5d5ce':
  Fix incorrect error check for mmap

cpu_ref/rsCpuIntrinsicColorMatrix.cpp

diff --git a/cpu_ref/rsCpuIntrinsicColorMatrix.cpp b/cpu_ref/rsCpuIntrinsicColorMatrix.cpp
index d9c0ded..64ce43f 100644
--- a/cpu_ref/rsCpuIntrinsicColorMatrix.cpp
+++ b/cpu_ref/rsCpuIntrinsicColorMatrix.cpp
@@ -486,7 +486,8 @@
     //StopWatch build_time("rs cm: build time");
     mBuf = (uint8_t *)mmap(0, mBufSize, PROT_READ | PROT_WRITE,
                                   MAP_PRIVATE | MAP_ANON, -1, 0);
-    if (!mBuf) {
+    if (mBuf == MAP_FAILED) {
+        mBuf = NULL;
         return false;
     }