am 3b6f86c9: Merge "Fix NVMAP_IOC_FROM_ID test" into lollipop-mr1-cts-dev

* commit '3b6f86c9da6fe76d0466bbf9ab53953e199af505':
  Fix NVMAP_IOC_FROM_ID test
diff --git a/tests/tests/security/jni/android_security_cts_NativeCodeTest.cpp b/tests/tests/security/jni/android_security_cts_NativeCodeTest.cpp
index a35581d..5029f6a 100644
--- a/tests/tests/security/jni/android_security_cts_NativeCodeTest.cpp
+++ b/tests/tests/security/jni/android_security_cts_NativeCodeTest.cpp
@@ -296,7 +296,7 @@
     bool      vulnerable = false;
 
     if (nvmap >= 0) {
-        if (0 >= ioctl(nvmap, NVMAP_IOC_FROM_ID)) {
+        if (0 == ioctl(nvmap, NVMAP_IOC_FROM_ID)) {
             /* IOCTL succeeded */
             vulnerable = true;
         }