X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fagilent-dmm%2Fapi.c;h=823740764a1d1d12c547298a5025b9e1df0d9386;hb=41812aca436805b0614f2a8f31cf2f8ce494aea0;hp=19a4144cca2aed4ea75df880087be1767ae7ace6;hpb=dcd438ee3523098201c7937e75e55775da3b506f;p=libsigrok.git

diff --git a/src/hardware/agilent-dmm/api.c b/src/hardware/agilent-dmm/api.c
index 19a4144c..82374076 100644
--- a/src/hardware/agilent-dmm/api.c
+++ b/src/hardware/agilent-dmm/api.c
@@ -89,7 +89,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	const char *conn, *serialcomm;
 	char *buf, **tokens;
 
-	drvc = di->priv;
+	drvc = di->context;
 	drvc->instances = NULL;
 
 	devices = NULL;
@@ -122,10 +122,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	}
 
 	len = 128;
-	if (!(buf = g_try_malloc(len))) {
-		sr_err("Serial buffer malloc failed.");
-		return NULL;
-	}
+	buf = g_malloc(len);
 	serial_readline(serial, &buf, &len, 250);
 	if (!len)
 		return NULL;
@@ -166,7 +163,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 static GSList *dev_list(const struct sr_dev_driver *di)
 {
-	return ((struct drv_context *)(di->priv))->instances;
+	return ((struct drv_context *)(di->context))->instances;
 }
 
 static int cleanup(const struct sr_dev_driver *di)
@@ -278,5 +275,5 @@ SR_PRIV struct sr_dev_driver agdmm_driver_info = {
 	.dev_close = std_serial_dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,
-	.priv = NULL,
+	.context = NULL,
 };