Browse Source

Merge commit '11a3641' into cg_merges_20131108a

Luke Dashjr 12 years ago
parent
commit
ce78dea074
1 changed files with 2 additions and 1 deletions
  1. 2 1
      driver-klondike.c

+ 2 - 1
driver-klondike.c

@@ -637,7 +637,8 @@ static int64_t klondike_scanwork(struct thr_info *thr)
 				newhashdev += klninfo->status[dev].maxcount; // hash counter wrapped
 				newhashdev += klninfo->status[dev].maxcount; // hash counter wrapped
 			newhashdev += klninfo->status[dev].hashcount - klninfo->devinfo[dev].lasthashcount;
 			newhashdev += klninfo->status[dev].hashcount - klninfo->devinfo[dev].lasthashcount;
 			klninfo->devinfo[dev].lasthashcount = klninfo->status[dev].hashcount;
 			klninfo->devinfo[dev].lasthashcount = klninfo->status[dev].hashcount;
-			klninfo->hashcount += (newhashdev << 32) / klninfo->status[dev].maxcount;
+			if (klninfo->status[dev].maxcount != 0)
+				klninfo->hashcount += (newhashdev << 32) / klninfo->status[dev].maxcount;
 
 
 			// todo: check stats for critical conditions
 			// todo: check stats for critical conditions
 		}
 		}