device_drv missing drv for cpu and incorrect test

12 years ago · a4e95cfa42
2 changed files with 2 additions and 1 deletions
--- a/cgminer.c
+++ b/cgminer.c
@ -5904,7 +5904,7 @@ static void *watchdog_thread(void __maybe_unused *userdata)
				@@ -5904,7 +5904,7 @@ static void *watchdog_thread(void __maybe_unused *userdata)
 				continue;

 #ifdef WANT_CPUMINE
-			if (cgpu->drv->drv != DRIVER_CPU)
+			if (cgpu->drv->drv == DRIVER_CPU)
 				continue;
 #endif
 			if (cgpu->status != LIFE_WELL && (now.tv_sec - thr->last.tv_sec < WATCHDOG_SICK_TIME)) {
--- a/driver-cpu.c
+++ b/driver-cpu.c
@ -844,6 +844,7 @@ CPUSearch:
				@@ -844,6 +844,7 @@ CPUSearch:
 }

 struct device_drv cpu_drv = {
+	.drv = DRIVER_CPU,
 	.dname = "cpu",
 	.name = "CPU",
 	.drv_detect = cpu_detect,