From e2578033cbaa62eebbc019dd77b4dbb1587fafad Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Sat, 25 May 2013 13:27:54 +1000 Subject: [PATCH] Do avalon_reset after info structure is set up. --- driver-avalon.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/driver-avalon.c b/driver-avalon.c index 6accf458..f0c57749 100644 --- a/driver-avalon.c +++ b/driver-avalon.c @@ -615,13 +615,6 @@ static bool avalon_detect_one(const char *devpath) avalon->threads = AVALON_MINER_THREADS; add_cgpu(avalon); - ret = avalon_reset(avalon, fd); - if (ret) { - ; /* FIXME: I think IT IS avalon and wait on reset; - * avalon_close(fd); - * return false; */ - } - avalon_infos = realloc(avalon_infos, sizeof(struct avalon_info *) * (total_devices + 1)); @@ -636,8 +629,6 @@ static bool avalon_detect_one(const char *devpath) avalon->device_data = avalon_infos[avalon->device_id]; info = avalon->device_data; - memset(info, 0, sizeof(struct avalon_info)); - info->baud = baud; info->miner_count = miner_count; info->asic_count = asic_count; @@ -657,6 +648,13 @@ static bool avalon_detect_one(const char *devpath) avalon->device_fd = -1; + ret = avalon_reset(avalon, fd); + if (ret) { + ; /* FIXME: I think IT IS avalon and wait on reset; + * avalon_close(fd); + * return false; */ + } + avalon_close(fd); return true; }