* @param di The driver instance to use.
* @param[in] prefix A driver-specific prefix string used for log messages.
*
- * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments, or
- * SR_ERR_MALLOC upon memory allocation errors.
+ * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments.
*/
SR_PRIV int std_init(struct sr_context *sr_ctx, struct sr_dev_driver *di,
const char *prefix)
return SR_ERR_ARG;
}
- if (!(drvc = g_try_malloc(sizeof(struct drv_context)))) {
- sr_err("%s: Driver context malloc failed.", prefix);
- return SR_ERR_MALLOC;
- }
-
+ drvc = g_malloc0(sizeof(struct drv_context));
drvc->sr_ctx = sr_ctx;
drvc->instances = NULL;
di->priv = drvc;
*
* This function can be used to implement the dev_open() driver API
* callback in drivers that use a serial port. The port is opened
- * with the SERIAL_RDWR and SERIAL_NONBLOCK flags.
+ * with the SERIAL_RDWR flag.
*
* If the open succeeded, the status field of the given sdi is set
* to SR_ST_ACTIVE.
struct sr_serial_dev_inst *serial;
serial = sdi->conn;
- if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
+ if (serial_open(serial, SERIAL_RDWR) != SR_OK)
return SR_ERR;
sdi->status = SR_ST_ACTIVE;
sr_scpi_free(sdi->conn);
}
if (clear_private)
+ /* The helper function is responsible for freeing
+ * its own sdi->priv! */
clear_private(sdi->priv);
else
g_free(sdi->priv);
+
sr_dev_inst_free(sdi);
}