X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flink-mso19%2Fapi.c;h=451cc9347a163d94e8f13196f866aee77cf2a610;hb=e743a47d6d23050c72aa1276c5df4a45a6bc5357;hp=c1162c982207f2c9f01317edc8b08a8563f343e9;hpb=aac29cc192ccf82b64e77b5e6b11b411da32deed;p=libsigrok.git

diff --git a/src/hardware/link-mso19/api.c b/src/hardware/link-mso19/api.c
index c1162c98..451cc934 100644
--- a/src/hardware/link-mso19/api.c
+++ b/src/hardware/link-mso19/api.c
@@ -178,10 +178,7 @@ static GSList *scan(GSList *options)
 
 		//Create the device context and set its params
 		struct dev_context *devc;
-		if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-			sr_err("Device context malloc failed.");
-			return devices;
-		}
+		devc = g_malloc0(sizeof(struct dev_context));
 
 		if (mso_parse_serial(iSerial, iProduct, devc) != SR_OK) {
 			sr_err("Invalid iSerial: %s.", iSerial);
@@ -198,10 +195,7 @@ static GSList *scan(GSList *options)
 			devc->protocol_trigger.mask[i] = 0xff;
 		}
 
-		if (!(devc->serial = sr_serial_dev_inst_new(conn, serialcomm))) {
-			g_free(devc);
-			return devices;
-		}
+		devc->serial = sr_serial_dev_inst_new(conn, serialcomm);
 
 		struct sr_dev_inst *sdi = g_malloc0(sizeof(struct sr_dev_inst));
 		sdi->status = SR_ST_INACTIVE;
@@ -223,9 +217,8 @@ static GSList *scan(GSList *options)
 		for (i = 0; i < NUM_CHANNELS; i++) {
 			struct sr_channel *ch;
 			chtype = (i == 0) ? SR_CHANNEL_ANALOG : SR_CHANNEL_LOGIC;
-			if (!(ch = sr_channel_new(i, chtype, TRUE,
-						   mso19_channel_names[i])))
-				return 0;
+			ch = sr_channel_new(i, chtype, TRUE,
+					    mso19_channel_names[i]);
 			sdi->channels = g_slist_append(sdi->channels, ch);
 		}