Browse Source

Merge branch 'bugfix_ztex_shutdown2' into bfgminer

Luke Dashjr 13 years ago
parent
commit
d6fc038fa6
1 changed files with 2 additions and 2 deletions
  1. 2 2
      driver-ztex.c

+ 2 - 2
driver-ztex.c

@@ -355,7 +355,7 @@ static int64_t ztex_scanhash(struct thr_info *thr, struct work *work,
 static void ztex_statline_before(char *buf, struct cgpu_info *cgpu)
 static void ztex_statline_before(char *buf, struct cgpu_info *cgpu)
 {
 {
 	char before[] = "               ";
 	char before[] = "               ";
-	if (cgpu->deven == DEV_ENABLED) {
+	if (cgpu->device_ztex) {
 		const char *snString = (char*)cgpu->device_ztex->snString;
 		const char *snString = (char*)cgpu->device_ztex->snString;
 		size_t snStringLen = strlen(snString);
 		size_t snStringLen = strlen(snString);
 		if (snStringLen > 14)
 		if (snStringLen > 14)
@@ -407,11 +407,11 @@ static void ztex_shutdown(struct thr_info *thr)
 	if (!ztex)
 	if (!ztex)
 		return;
 		return;
 	
 	
+	cgpu->device_ztex = NULL;
 	if (ztex->root->numberOfFpgas > 1 && ztex->fpgaNum == 0)
 	if (ztex->root->numberOfFpgas > 1 && ztex->fpgaNum == 0)
 		pthread_mutex_destroy(&ztex->mutex);
 		pthread_mutex_destroy(&ztex->mutex);
 	applog(LOG_DEBUG, "%s: shutdown", ztex->repr);
 	applog(LOG_DEBUG, "%s: shutdown", ztex->repr);
 	libztex_destroy_device(ztex);
 	libztex_destroy_device(ztex);
-	cgpu->device_ztex = NULL;
 }
 }
 
 
 static void ztex_disable(struct thr_info *thr)
 static void ztex_disable(struct thr_info *thr)