X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fappa-55ii%2Fapi.c;h=e033f5d37d8f3216f8f1c9e5732007e80d038bda;hb=208c1d35435626a11afa1ab301b2071b2a4e187b;hp=0ed6144a074fe09399ce3095332ca653cbc1e974;hpb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;p=libsigrok.git diff --git a/src/hardware/appa-55ii/api.c b/src/hardware/appa-55ii/api.c index 0ed6144a..e033f5d3 100644 --- a/src/hardware/appa-55ii/api.c +++ b/src/hardware/appa-55ii/api.c @@ -225,8 +225,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * return SR_OK; } -static int dev_acquisition_start(const struct sr_dev_inst *sdi, - void *cb_data) +static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) { struct sr_serial_dev_inst *serial; struct dev_context *devc; @@ -235,11 +234,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; - if (!(devc = sdi->priv)) { - sr_err("sdi->priv was NULL."); - return SR_ERR_BUG; - } - + devc = sdi->priv; devc->session_cb_data = cb_data; /* @@ -250,7 +245,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, devc->num_samples = 0; devc->start_time = g_get_monotonic_time(); - /* Send header packet to the session bus. */ std_session_send_df_header(cb_data, LOG_PREFIX); /* Poll every 50ms, or whenever some data comes in. */