From: Stefan Brüns Date: Mon, 11 Dec 2017 03:17:26 +0000 (+0100) Subject: rigol-ds: Fix crash when fetching logic channels X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=bbcffe51d29343f7648e1e2f3b925dd571984bd3;p=libsigrok.git rigol-ds: Fix crash when fetching logic channels When refactoring the code, some places where sr_scpi_send was replaced by rigol_ds_config_set the first argument was not changed from sdi->conn to sdi. Fix the remaining ones. Fix: https://sigrok.org/bug/1073 Signed-off-by: Stefan Brüns --- diff --git a/src/hardware/rigol-ds/protocol.c b/src/hardware/rigol-ds/protocol.c index 833104e8..d21008b6 100644 --- a/src/hardware/rigol-ds/protocol.c +++ b/src/hardware/rigol-ds/protocol.c @@ -221,7 +221,7 @@ static int rigol_ds_check_stop(const struct sr_dev_inst *sdi) return SR_OK; if (ch->type == SR_CHANNEL_LOGIC) { - if (rigol_ds_config_set(sdi->conn, ":WAV:SOUR LA") != SR_OK) + if (rigol_ds_config_set(sdi, ":WAV:SOUR LA") != SR_OK) return SR_ERR; } else { if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d", @@ -440,7 +440,7 @@ SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi) break; case PROTOCOL_V3: if (ch->type == SR_CHANNEL_LOGIC) { - if (rigol_ds_config_set(sdi->conn, ":WAV:SOUR LA") != SR_OK) + if (rigol_ds_config_set(sdi, ":WAV:SOUR LA") != SR_OK) return SR_ERR; } else { if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d",