X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fftdi-la%2Fapi.c;h=240aa7ad2597eed0a81145c24bf901b7e5ee6f4f;hb=d2f7c417fdd96a13d8fd86350d2fc13db16f626c;hp=22715a1f43dc20480bb0724e624d439550b5b523;hpb=bee2b0168c087676c1b365861d8c2d4714afa9b9;p=libsigrok.git diff --git a/src/hardware/ftdi-la/api.c b/src/hardware/ftdi-la/api.c index 22715a1f..240aa7ad 100644 --- a/src/hardware/ftdi-la/api.c +++ b/src/hardware/ftdi-la/api.c @@ -120,7 +120,7 @@ static void scan_device(struct ftdi_context *ftdic, model = g_malloc(32); serial_num = g_malloc(32); rv = ftdi_usb_get_strings(ftdic, dev, vendor, 32, - model, 32, serial_num, 32); + model, 32, serial_num, 32); switch (rv) { case 0: break; @@ -462,10 +462,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) static int dev_acquisition_stop(struct sr_dev_inst *sdi) { - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - - sr_dbg("Stopping acquisition."); sr_session_source_remove(sdi->session, -1); std_session_send_df_end(sdi);