Browse Source

Merge commit 'a12a057' into bfgminer

Luke Dashjr 12 years ago
parent
commit
6422e2d9c1
2 changed files with 4 additions and 1 deletions
  1. 3 0
      deviceapi.c
  2. 1 1
      driver-icarus.c

+ 3 - 0
deviceapi.c

@@ -600,6 +600,9 @@ void *miner_thread(void *userdata)
 		goto out;
 	}
 
+	if (cgpu->deven != DEV_ENABLED)
+		mt_disable_start(mythr);
+	
 	thread_reportout(mythr);
 	applog(LOG_DEBUG, "Popping ping in miner thread");
 	notifier_read(mythr->notifier);  // Wait for a notification to start

+ 1 - 1
driver-icarus.c

@@ -1032,7 +1032,7 @@ keepwaiting:
 		// Delay job start until later...
 	}
 	else
-	if (unlikely(icarus->deven == DEV_DISABLED || !icarus_job_start(thr)))
+	if (unlikely(icarus->deven != DEV_ENABLED || !icarus_job_start(thr)))
 		state->firstrun = true;
 
 	if (info->quirk_reopen == 2 && !icarus_reopen(icarus, state, &fd))