diff --git a/device-gpu.c b/device-gpu.c
index f8813b2b..8dfe92d5 100644
--- a/device-gpu.c
+++ b/device-gpu.c
@@ -425,7 +425,7 @@ char *print_ndevs_and_exit(int *ndevs)
 	opt_log_output = true;
 	opencl_api.api_detect();
 	clear_adl(*ndevs);
-	applog(LOG_INFO, "%i GPU devices detected", *ndevs);
+	applog(LOG_INFO, "%i GPU devices max detected", *ndevs);
 	exit(*ndevs);
 }
 #endif
diff --git a/ocl.c b/ocl.c
index d976ef73..7b5f9014 100644
--- a/ocl.c
+++ b/ocl.c
@@ -68,65 +68,60 @@ char *file_contents(const char *filename, int *length)
 	return (char*)buffer;
 }
 
-int clDevicesNum() {
+int clDevicesNum(void) {
 	cl_int status;
 	char pbuff[256];
 	cl_uint numDevices;
 	cl_uint numPlatforms;
+	cl_platform_id *platforms;
 	cl_platform_id platform = NULL;
+	unsigned int most_devices = 0, i;
 
 	status = clGetPlatformIDs(0, NULL, &numPlatforms);
 	/* If this fails, assume no GPUs. */
 	if (status != CL_SUCCESS) {
-		applog(LOG_INFO, "clGetPlatformsIDs failed (no GPU?)");
-		return 0;
-	}
-
-	if (numPlatforms > 0) {
-		cl_platform_id* platforms = (cl_platform_id *)malloc(numPlatforms*sizeof(cl_platform_id));
-		unsigned int i;
-
-		status = clGetPlatformIDs(numPlatforms, platforms, NULL);
-		if (status != CL_SUCCESS) {
-			applog(LOG_ERR, "Error: Getting Platform Ids. (clGetPlatformsIDs)");
-			return -1;
-		}
-
-		for (i = 0; i < numPlatforms; ++i) {
-			status = clGetPlatformInfo( platforms[i], CL_PLATFORM_VENDOR, sizeof(pbuff), pbuff, NULL);
-			if (status != CL_SUCCESS) {
-				applog(LOG_ERR, "Error: Getting Platform Info. (clGetPlatformInfo)");
-				free(platforms);
-				return -1;
-			}
-			platform = platforms[i];
-			if (!strcmp(pbuff, "Advanced Micro Devices, Inc.") ||
-			    !strcmp(pbuff, "NVIDIA Corporation"))
-				break;
-		}
-		free(platforms);
+		applog(LOG_ERR, "clGetPlatformsIDs failed (no OpenCL SDK installed?)");
+		return -1;
 	}
 
-	if (platform == NULL) {
-		perror("NULL platform found!\n");
+	if (numPlatforms == 0) {
+		applog(LOG_ERR, "clGetPlatformsIDs returned no platforms (no OpenCL SDK installed?)");
 		return -1;
 	}
 
-	applog(LOG_INFO, "CL Platform vendor: %s", pbuff);
-	status = clGetPlatformInfo(platform, CL_PLATFORM_NAME, sizeof(pbuff), pbuff, NULL);
-	if (status == CL_SUCCESS)
-		applog(LOG_INFO, "CL Platform name: %s", pbuff);
-	status = clGetPlatformInfo(platform, CL_PLATFORM_VERSION, sizeof(pbuff), pbuff, NULL);
-	if (status == CL_SUCCESS)
-		applog(LOG_INFO, "CL Platform version: %s", pbuff);
-
-	status = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 0, NULL, &numDevices);
+	platforms = (cl_platform_id *)alloca(numPlatforms*sizeof(cl_platform_id));
+	status = clGetPlatformIDs(numPlatforms, platforms, NULL);
 	if (status != CL_SUCCESS) {
-		applog(LOG_ERR, "Error: Getting Device IDs (num)");
+		applog(LOG_ERR, "Error: Getting Platform Ids. (clGetPlatformsIDs)");
 		return -1;
 	}
 
-	return numDevices;
+	for (i = 0; i < numPlatforms; i++) {
+		status = clGetPlatformInfo( platforms[i], CL_PLATFORM_VENDOR, sizeof(pbuff), pbuff, NULL);
+		if (status != CL_SUCCESS) {
+			applog(LOG_ERR, "Error: Getting Platform Info. (clGetPlatformInfo)");
+			free(platforms);
+			return -1;
+		}
+		platform = platforms[i];
+		applog(LOG_INFO, "CL Platform vendor: %s", pbuff);
+		status = clGetPlatformInfo(platform, CL_PLATFORM_NAME, sizeof(pbuff), pbuff, NULL);
+		if (status == CL_SUCCESS)
+			applog(LOG_INFO, "CL Platform name: %s", pbuff);
+		status = clGetPlatformInfo(platform, CL_PLATFORM_VERSION, sizeof(pbuff), pbuff, NULL);
+		if (status == CL_SUCCESS)
+			applog(LOG_INFO, "CL Platform version: %s", pbuff);
+		status = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 0, NULL, &numDevices);
+		if (status != CL_SUCCESS) {
+			applog(LOG_ERR, "Error: Getting Device IDs (num)");
+			return -1;
+		}
+		applog(LOG_INFO, "Platform devices: %d", numDevices);
+		if (numDevices > most_devices)
+			most_devices = numDevices;
+	}
+
+	return most_devices;
 }
 
 static int advance(char **area, unsigned *remaining, const char *marker)
diff --git a/ocl.h b/ocl.h
index 22c0d83c..171af1b2 100644
--- a/ocl.h
+++ b/ocl.h
@@ -24,7 +24,7 @@ typedef struct {
 } _clState;
 
 extern char *file_contents(const char *filename, int *length);
-extern int clDevicesNum();
+extern int clDevicesNum(void);
 extern _clState *initCl(unsigned int gpu, char *name, size_t nameSize);
 #endif /* HAVE_OPENCL */
 #endif /* __OCL_H__ */