Browse Source

Merge branch 'master' of github.com:ckolivas/cgminer

nfactor-troky
ckolivas 12 years ago
parent
commit
9fd60bb53a
  1. 12
      cgminer.c

12
cgminer.c

@ -2998,14 +2998,14 @@ static struct work *make_clone(struct work *work)
static void stage_work(struct work *work); static void stage_work(struct work *work);
/* Called with stgd_lock held */ static bool clone_available(void)
static bool __clone_available(void)
{ {
struct work *work, *tmp; struct work *work, *tmp;
bool cloned = false; bool cloned = false;
mutex_lock(stgd_lock);
if (!staged_rollable) if (!staged_rollable)
goto out; goto out_unlock;
HASH_ITER(hh, staged_work, work, tmp) { HASH_ITER(hh, staged_work, work, tmp) {
if (can_roll(work) && should_roll(work)) { if (can_roll(work) && should_roll(work)) {
@ -3021,7 +3021,9 @@ static bool __clone_available(void)
} }
} }
out: out_unlock:
mutex_unlock(stgd_lock);
return cloned; return cloned;
} }
@ -6863,7 +6865,7 @@ retry:
continue; continue;
} }
if (__clone_available()) { if (clone_available()) {
applog(LOG_DEBUG, "Cloned getwork work"); applog(LOG_DEBUG, "Cloned getwork work");
free_work(work); free_work(work);
continue; continue;

Loading…
Cancel
Save