diff --git a/api/boinc_opencl.cpp b/api/boinc_opencl.cpp
index 4f2198a1ff..005fcdaad0 100644
--- a/api/boinc_opencl.cpp
+++ b/api/boinc_opencl.cpp
@@ -56,7 +56,7 @@ int boinc_get_opencl_ids_aux(
             MAX_COPROC_INSTANCES, devices, &num_devices
         );
 
-        if (num_devices > (cl_uint)(device_num + 1)) continue;
+        if (device_num >= (int)num_devices) continue;
     
         cl_device_id device_id = devices[device_num];
 
diff --git a/checkin_notes b/checkin_notes
index bb21c90b73..1a7806dcd4 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -8316,3 +8316,9 @@ Jeff    9 Nov 2011
         sched_assign.cpp
     lib/
         parse.cpp
+
+David  9 Nov 2011
+    - OpenCL API: fix logic error
+
+    api/
+        boinc_opencl.cpp