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 da560d86e0702935e3a16fdbbb8ed47263c39bea..ada4fcc9b002989572ce5005366fad7636cc35f5 100644 (file)
--- 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;