atten-pps3xxx: silence NULL dereference compiler warnings

[libsigrok.git] / src / hardware / pce-322a / protocol.c

diff --git a/src/hardware/pce-322a/protocol.c b/src/hardware/pce-322a/protocol.c
index 6dc9deeb7da8c746f8fc19188f60cf6e4b3e9598..564f2984de50cbc5574d174fa21ca4cf2be8837a 100644 (file)
--- a/src/hardware/pce-322a/protocol.c
+++ b/src/hardware/pce-322a/protocol.c
@@ -32,10 +32,7 @@ static int send_command(const struct sr_dev_inst *sdi, uint16_t command)
        if (!(serial = sdi->conn))
                return SR_ERR;
 
-       if (serial_write_nonblocking(serial, (const void *)buffer, 2) != 2)
-               return SR_ERR;
-
-       return SR_OK;
+       return serial_write_blocking(serial, (const void *)buffer, 2, 0);
 }
 
 static int send_long_command(const struct sr_dev_inst *sdi, uint32_t command)
@@ -51,10 +48,7 @@ static int send_long_command(const struct sr_dev_inst *sdi, uint32_t command)
        if (!(serial = sdi->conn))
                return SR_ERR;
 
-       if (serial_write_nonblocking(serial, (const void *)buffer, 4) != 4)
-               return SR_ERR;
-
-       return SR_OK;
+       return serial_write_blocking(serial, (const void *)buffer, 4, 0);
 }
 
 static void send_data(const struct sr_dev_inst *sdi, float sample)
@@ -82,7 +76,7 @@ static void send_data(const struct sr_dev_inst *sdi, float sample)
        devc->num_samples++;
        /* Limiting number of samples is only supported for live data. */
        if (devc->cur_data_source == DATA_SOURCE_LIVE && devc->limit_samples && devc->num_samples >= devc->limit_samples)
-               sdi->driver->dev_acquisition_stop((struct sr_dev_inst *)sdi);
+               sr_dev_acquisition_stop((struct sr_dev_inst *)sdi);
 }
 
 static void process_measurement(const struct sr_dev_inst *sdi)