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

asix-sigma: don't attempt to free static struct 

Added more debugging as well.
This commit is contained in:
Bert Vermeulen 2012-07-14 16:14:01 +02:00
parent 067d07166b
commit eec944c5b8
1 changed files with 7 additions and 3 deletions
hardware/asix-sigma
asix-sigma.c

10
hardware/asix-sigma/asix-sigma.c
View File

@ -447,6 +447,7 @@ static GSList *hw_scan(GSList *options)
struct ftdi_device_list *devlist; struct ftdi_device_list *devlist;
char serial_txt[10]; char serial_txt[10];
uint32_t serial; uint32_t serial;
int ret;
(void)options; (void)options;
devices = NULL; devices = NULL;
@ -461,9 +462,12 @@ static GSList *hw_scan(GSList *options)
/* Look for SIGMAs. */ /* Look for SIGMAs. */
if (ftdi_usb_find_all(&ctx->ftdic, &devlist, if ((ret = ftdi_usb_find_all(&ctx->ftdic, &devlist,
USB_VENDOR, USB_PRODUCT) <= 0) USB_VENDOR, USB_PRODUCT)) <= 0) {
if (ret < 0)
sr_err("ftdi_usb_find_all(): %d", ret);
goto free; goto free;
}
/* Make sure it's a version 1 or 2 SIGMA. */ /* Make sure it's a version 1 or 2 SIGMA. */
ftdi_usb_get_strings(&ctx->ftdic, devlist->dev, NULL, 0, NULL, 0, ftdi_usb_get_strings(&ctx->ftdic, devlist->dev, NULL, 0, NULL, 0,
@ -503,7 +507,7 @@ static GSList *hw_scan(GSList *options)
return devices; return devices;
free: free:
ftdi_free(&ctx->ftdic); ftdi_deinit(&ctx->ftdic);
g_free(ctx); g_free(ctx);
return NULL; return NULL;
} }