From: Soeren Apel <redacted>
Date: Sun, 5 Jul 2015 16:01:45 +0000 (+0200)
Subject: Fix #574 by setting up the transfer first, then starting acquisition
X-Git-Tag: libsigrok-0.4.0~468
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=815e3cb83e715fad442c491d406f6ceba79e3a74;p=libsigrok.git

Fix #574 by setting up the transfer first, then starting acquisition
---

diff --git a/src/hardware/fx2lafw/api.c b/src/hardware/fx2lafw/api.c
index da560d86..ada4fcc9 100644
--- a/src/hardware/fx2lafw/api.c
+++ b/src/hardware/fx2lafw/api.c
@@ -780,9 +780,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 		dslogic_trigger_request(sdi);
 	}
 	else {
-		if ((ret = fx2lafw_command_start_acquisition(sdi)) != SR_OK)
-			return ret;
 		start_transfers(sdi);
+		if ((ret = fx2lafw_command_start_acquisition(sdi)) != SR_OK) {
+			fx2lafw_abort_acquisition(devc);
+			return ret;
+		}
 	}
 
 	return SR_OK;