Browse Source

Merge commit '55b10e5' into bfgminer

Luke Dashjr 12 years ago
parent
commit
95d1fe185b
1 changed files with 1 additions and 4 deletions
  1. 1 4
      driver-bitforce.c

+ 1 - 4
driver-bitforce.c

@@ -1749,7 +1749,7 @@ void bitforce_queue_flush(struct thr_info *thr)
 	
 	
 	struct cgpu_info *bitforce = thr->cgpu;
 	struct cgpu_info *bitforce = thr->cgpu;
 	struct bitforce_data *data = bitforce->device_data;
 	struct bitforce_data *data = bitforce->device_data;
-	char *buf = &data->noncebuf[0], *buf2;
+	char *buf = &data->noncebuf[0], *buf2 = NULL;
 	const char *cmd = "ZqX";
 	const char *cmd = "ZqX";
 	unsigned flushed;
 	unsigned flushed;
 	struct _jobinfo *processing = NULL, *item, *this;
 	struct _jobinfo *processing = NULL, *item, *this;
@@ -1760,10 +1760,7 @@ void bitforce_queue_flush(struct thr_info *thr)
 	// TODO: Call "ZQX" most of the time: don't need to do sanity checks so often
 	// TODO: Call "ZQX" most of the time: don't need to do sanity checks so often
 	bitforce_zox(thr, cmd);
 	bitforce_zox(thr, cmd);
 	if (!strncasecmp(buf, "OK:FLUSHED", 10))
 	if (!strncasecmp(buf, "OK:FLUSHED", 10))
-	{
 		flushed = atoi(&buf[10]);
 		flushed = atoi(&buf[10]);
-		buf2 = NULL;
-	}
 	else
 	else
 	if ((!strncasecmp(buf, "COUNT:", 6)) && (buf2 = strstr(buf, "FLUSHED:")) )
 	if ((!strncasecmp(buf, "COUNT:", 6)) && (buf2 = strstr(buf, "FLUSHED:")) )
 	{
 	{