asix-sigma: Drop duplicate error message prefixes.

[libsigrok.git] / src / hardware / asix-sigma / protocol.c

diff --git a/src/hardware/asix-sigma/protocol.c b/src/hardware/asix-sigma/protocol.c
index a9c1695686c10c4f6b41742fd4f09eb291d79453..3c29aad9f3a33dfc75615a5e2535f4018fb5d06e 100644 (file)
--- a/src/hardware/asix-sigma/protocol.c
+++ b/src/hardware/asix-sigma/protocol.c
@@ -1004,10 +1004,6 @@ static int download_capture(struct sr_dev_inst *sdi)
        devc = sdi->priv;
        dl_events_in_line = 64 * 7;
 
-       dram_line = g_try_malloc0(chunks_per_read * sizeof(*dram_line));
-       if (!dram_line)
-               return FALSE;
-
        sr_info("Downloading sample data.");
        devc->state.state = SIGMA_DOWNLOAD;
 
@@ -1020,7 +1016,7 @@ static int download_capture(struct sr_dev_inst *sdi)
        sigma_set_register(WRITE_MODE, WMR_FORCESTOP | WMR_SDRAMWRITEEN, devc);
        do {
                if (sigma_read_register(READ_MODE, &modestatus, 1, devc) != 1) {
-                       sr_err("sigma: failed while waiting for RMR_POSTTRIGGERED bit");
+                       sr_err("failed while waiting for RMR_POSTTRIGGERED bit");
                        return FALSE;
                }
        } while (!(modestatus & RMR_POSTTRIGGERED));
@@ -1033,7 +1029,7 @@ static int download_capture(struct sr_dev_inst *sdi)
 
        /* Check if trigger has fired. */
        if (sigma_read_register(READ_MODE, &modestatus, 1, devc) != 1) {
-               sr_err("sigma: failed to read READ_MODE register");
+               sr_err("failed to read READ_MODE register");
                return FALSE;
        }
        trg_line = ~0;
@@ -1063,6 +1059,9 @@ static int download_capture(struct sr_dev_inst *sdi)
        } else {
                dl_first_line = 0;
        }
+       dram_line = g_try_malloc0(chunks_per_read * sizeof(*dram_line));
+       if (!dram_line)
+               return FALSE;
        dl_lines_done = 0;
        while (dl_lines_total > dl_lines_done) {
                /* We can download only up-to 32 DRAM lines in one go! */