Commit 5ba07b9a0379f3c48b473bc3f4aa5293ea59931d

James Z.M. Gao 2013-04-19T09:03:41

Merge remote-tracking branch 'upstream/master'

diff --git a/driver-avalon.c b/driver-avalon.c
index 0ff9f43..28af4cd 100644
--- a/driver-avalon.c
+++ b/driver-avalon.c
@@ -949,20 +949,22 @@ static int64_t avalon_scanhash(struct thr_info *thr)
 
 	avalon_rotate_array(avalon);
 
-	record_temp_fan(info, &ar, &(avalon->temp));
-	applog(LOG_INFO,
-	       "Avalon: Fan1: %d/m, Fan2: %d/m, Fan3: %d/m\t"
-	       "Temp1: %dC, Temp2: %dC, Temp3: %dC, TempMAX: %dC",
-	       info->fan0, info->fan1, info->fan2,
-	       info->temp0, info->temp1, info->temp2, info->temp_max);
-	info->temp_history_index++;
-	info->temp_sum += avalon->temp;
-	applog(LOG_DEBUG, "Avalon: temp_index: %d, temp_count: %d, temp_old: %d",
-	       info->temp_history_index, info->temp_history_count, info->temp_old);
-	if (info->temp_history_index == info->temp_history_count) {
-		adjust_fan(info);
-		info->temp_history_index = 0;
-		info->temp_sum = 0;
+	if (hash_count) {
+		record_temp_fan(info, &ar, &(avalon->temp));
+		applog(LOG_INFO,
+		       "Avalon: Fan1: %d/m, Fan2: %d/m, Fan3: %d/m\t"
+		       "Temp1: %dC, Temp2: %dC, Temp3: %dC, TempMAX: %dC",
+		       info->fan0, info->fan1, info->fan2,
+		       info->temp0, info->temp1, info->temp2, info->temp_max);
+		info->temp_history_index++;
+		info->temp_sum += avalon->temp;
+		applog(LOG_DEBUG, "Avalon: temp_index: %d, temp_count: %d, temp_old: %d",
+		       info->temp_history_index, info->temp_history_count, info->temp_old);
+		if (info->temp_history_index == info->temp_history_count) {
+			adjust_fan(info);
+			info->temp_history_index = 0;
+			info->temp_sum = 0;
+		}
 	}
 
 	/* This hashmeter is just a utility counter based on returned shares */