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

scpi-pps: Initialise sdi with status SR_ST_INACTIVE. 

Without this change a segfault occurs at exit after scan, because
dev_close() is called and the device is believed to be open.
This commit is contained in:
Martin Ling 2015-03-18 18:02:06 +00:00 committed by Uwe Hermann
parent 40c2c9159c
commit 7d4f1741e3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hardware/scpi-pps/api.c
View File

@ -90,7 +90,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
} }
sdi = g_malloc0(sizeof(struct sr_dev_inst)); sdi = g_malloc0(sizeof(struct sr_dev_inst));
sdi->status = SR_ST_ACTIVE; sdi->status = SR_ST_INACTIVE;
sdi->vendor = g_strdup(vendor); sdi->vendor = g_strdup(vendor);
sdi->model = g_strdup(hw_info->model); sdi->model = g_strdup(hw_info->model);
sdi->version = g_strdup(hw_info->firmware_version); sdi->version = g_strdup(hw_info->firmware_version);
@ -193,7 +193,7 @@ static int dev_open(struct sr_dev_inst *sdi)
struct sr_scpi_dev_inst *scpi; struct sr_scpi_dev_inst *scpi;
GVariant *beeper; GVariant *beeper;
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_INACTIVE)
return SR_ERR; return SR_ERR;
scpi = sdi->conn; scpi = sdi->conn;