Merge branch 'master' into mr
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
diff --git a/cgminer.c b/cgminer.c
index a6ab03f..df98beb 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -4983,7 +4983,9 @@ void enable_device(struct cgpu_info *cgpu)
cgpu->deven = DEV_ENABLED;
devices[cgpu->cgminer_id = cgminer_id_count++] = cgpu;
mining_threads += cgpu->threads;
+#ifdef HAVE_CURSES
adj_width(mining_threads, &dev_width);
+#endif
#ifdef HAVE_OPENCL
if (cgpu->api == &opencl_api) {
gpu_threads += cgpu->threads;
diff --git a/driver-bitforce.c b/driver-bitforce.c
index f67bdcc..2b371c1 100644
--- a/driver-bitforce.c
+++ b/driver-bitforce.c
@@ -145,6 +145,10 @@ static void biforce_clear_buffer(struct cgpu_info *bitforce)
{
int fdDev = bitforce->device_fd;
char pdevbuf[0x100];
+ int count = 0;
+
+ if (!fdDev)
+ return;
applog(LOG_DEBUG, "BFL%i: Clearing read buffer", bitforce->device_id);
@@ -152,7 +156,7 @@ static void biforce_clear_buffer(struct cgpu_info *bitforce)
do {
pdevbuf[0] = '\0';
BFgets(pdevbuf, sizeof(pdevbuf), fdDev);
- } while (pdevbuf[0]);
+ } while (pdevbuf[0] && (++count < 10));
mutex_unlock(&bitforce->device_mutex);
}