BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rigol-ds: Fix broken channel group check in config_list().

This commit is contained in:
Martin Ling 2015-03-19 19:22:04 +00:00
parent f579d08bc5
commit 40c2c9159c
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/hardware/rigol-ds/api.c
View File

@ -818,15 +818,10 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
return SR_ERR_ARG; return SR_ERR_ARG;
/* If a channel group is specified, it must be a valid one. */ /* If a channel group is specified, it must be a valid one. */
if (cg) { if (cg && !g_slist_find(sdi->channel_groups, cg)) {
for (i = 0; i < devc->model->analog_channels; i++)
if (cg == devc->analog_groups[i])
break;
if (i >= devc->model->analog_channels) {
sr_err("Invalid channel group specified."); sr_err("Invalid channel group specified.");
return SR_ERR; return SR_ERR;
} }
}
switch (key) { switch (key) {
case SR_CONF_DEVICE_OPTIONS: case SR_CONF_DEVICE_OPTIONS: