X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-dso%2Fapi.c;h=2b039ed22b60e32e499141fbb45fdf29e573a3ff;hb=a95f142e88fa5368adfabf87544acfdeed7d7604;hp=1676085e781b5be30e8e8d43beee6ad3b594fa97;hpb=1a46cc62e2b528bcaeb1f8dc0c952a81b3bcba5c;p=libsigrok.git diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c index 1676085e..2b039ed2 100644 --- a/src/hardware/hantek-dso/api.c +++ b/src/hardware/hantek-dso/api.c @@ -827,8 +827,7 @@ static void receive_transfer(struct libusb_transfer *transfer) } } else { /* Already past the trigger point, just send it all out. */ - send_chunk(sdi, transfer->buffer, - num_samples); + send_chunk(sdi, transfer->buffer, num_samples); } devc->samp_received += num_samples; @@ -939,8 +938,7 @@ static int handle_event(int fd, int revents, void *cb_data) devc->trigger_offset = trigger_offset; num_channels = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1; - /* TODO: Check malloc return value. */ - devc->framebuf = g_try_malloc(devc->framesize * num_channels * 2); + devc->framebuf = g_malloc(devc->framesize * num_channels * 2); devc->samp_buffered = devc->samp_received = 0; /* Tell the scope to send us the first frame. */