X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flink-mso19%2Fprotocol.c;h=1a0b7bce39820a12dffd19a5f60fa1d31f38d951;hb=c442ffda0fc6fa9bc3c5397a21ef1d04f01a64a1;hp=11fa8a616f79960795983833e953122537128d93;hpb=a95f142e88fa5368adfabf87544acfdeed7d7604;p=libsigrok.git

diff --git a/src/hardware/link-mso19/protocol.c b/src/hardware/link-mso19/protocol.c
index 11fa8a61..1a0b7bce 100644
--- a/src/hardware/link-mso19/protocol.c
+++ b/src/hardware/link-mso19/protocol.c
@@ -198,7 +198,7 @@ SR_PRIV int mso_dac_out(const struct sr_dev_inst *sdi, uint16_t val)
 	return mso_send_control_message(devc->serial, ARRAY_AND_SIZE(ops));
 }
 
-SR_PRIV inline uint16_t mso_calc_raw_from_mv(struct dev_context * devc)
+SR_PRIV uint16_t mso_calc_raw_from_mv(struct dev_context *devc)
 {
 	return (uint16_t) (0x200 -
 			   ((devc->dso_trigger_voltage / devc->dso_probe_attn) /
@@ -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;