Fix #442 by renaming sr_dev_driver.priv to .context

[libsigrok.git] / src / hardware / pipistrello-ols / api.c

diff --git a/src/hardware/pipistrello-ols/api.c b/src/hardware/pipistrello-ols/api.c
index defb39785d32eb994fd954ba55f1598360ddb90c..3c7fc7b1790c0af6e1c37f33d929bb85523631f7 100644 (file)
--- a/src/hardware/pipistrello-ols/api.c
+++ b/src/hardware/pipistrello-ols/api.c
@@ -93,7 +93,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
        (void)options;
 
-       drvc = di->priv;
+       drvc = di->context;
 
        devices = NULL;
 
@@ -110,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())) {
@@ -197,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;
@@ -205,7 +201,7 @@ err_free_devc:
 
 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 void clear_helper(void *priv)
@@ -743,5 +739,5 @@ SR_PRIV struct sr_dev_driver p_ols_driver_info = {
        .dev_close = dev_close,
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,
-       .priv = NULL,
+       .context = NULL,
 };