X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fpipistrello-ols%2Fapi.c;h=b84ff193ea8404bbb47ae47ca9eb6aa19bbae140;hb=98fec29ecbb5093856b69311be8e937c162edded;hp=31fd9ac2568379fc1efbc67d09b509c621b030a2;hpb=53cda65a6bff58efed83b9a1c9b058f7d713ba19;p=libsigrok.git

diff --git a/src/hardware/pipistrello-ols/api.c b/src/hardware/pipistrello-ols/api.c
index 31fd9ac2..b84ff193 100644
--- a/src/hardware/pipistrello-ols/api.c
+++ b/src/hardware/pipistrello-ols/api.c
@@ -65,7 +65,6 @@ SR_PRIV const char *p_ols_channel_names[] = {
 	"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12",
 	"13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23",
 	"24", "25", "26", "27", "28", "29", "30", "31",
-	NULL,
 };
 
 /* Default supported samplerates, can be overridden by device metadata. */
@@ -111,10 +110,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	devc->flag_reg = 0;
 
 	/* Allocate memory for the incoming ftdi data. */
-	if (!(devc->ftdi_buf = g_try_malloc0(FTDI_BUF_SIZE))) {
-		sr_err("ftdi_buf malloc failed.");
-		goto err_free_devc;
-	}
+	devc->ftdi_buf = g_malloc0(FTDI_BUF_SIZE);
 
 	/* Allocate memory for the FTDI context (ftdic) and initialize it. */
 	if (!(devc->ftdic = ftdi_new())) {
@@ -198,7 +194,6 @@ err_free_ftdic:
 	ftdi_free(devc->ftdic); /* NOT free() or g_free()! */
 err_free_ftdi_buf:
 	g_free(devc->ftdi_buf);
-err_free_devc:
 	g_free(devc);
 
 	return NULL;
@@ -443,7 +438,7 @@ static int dev_open(struct sr_dev_inst *sdi)
 	if (p_ols_open(devc) != SR_OK) {
 		return SR_ERR;
 	} else {
-	  sdi->status = SR_ST_ACTIVE;
+		sdi->status = SR_ST_ACTIVE;
 		return SR_OK;
 	}
 }