Fix #442 by renaming sr_dev_driver.priv to .context

[libsigrok.git] / src / hardware / link-mso19 / protocol.c

diff --git a/src/hardware/link-mso19/protocol.c b/src/hardware/link-mso19/protocol.c
index 11fa8a616f79960795983833e953122537128d93..ca85ffaf60dfd920599446b9fe42871430bfedbc 100644 (file)
--- a/src/hardware/link-mso19/protocol.c
+++ b/src/hardware/link-mso19/protocol.c
@@ -336,7 +336,7 @@ SR_PRIV int mso_check_trigger(struct sr_serial_dev_inst *serial, uint8_t *info)
 
        sr_dbg("Requesting trigger state.");
        ret = mso_send_control_message(serial, ARRAY_AND_SIZE(ops));
-       if (info == NULL || ret != SR_OK)
+       if (!info || ret != SR_OK)
                return ret;
 
        uint8_t buf = 0;
@@ -357,7 +357,7 @@ SR_PRIV int mso_receive_data(int fd, int revents, void *cb_data)
        GSList *l;
        int i;
 
-       struct drv_context *drvc = di->priv;
+       struct drv_context *drvc = di->context;
 
        /* Find this device's devc struct by its fd. */
        struct dev_context *devc = NULL;