Route sr_source_remove for all serial devices through a wrapper.

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

diff --git a/hardware/link-mso19/protocol.c b/hardware/link-mso19/protocol.c
index 09c7bc7de2430c2c7489f1b00db6264c6425a679..fbb50054ab24f8194d6989985677212eb9184377 100644 (file)
--- a/hardware/link-mso19/protocol.c
+++ b/hardware/link-mso19/protocol.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2011 Daniel Ribeiro <drwyrm@gmail.com>
  * Copyright (C) 2012 Renato Caldas <rmsc@fe.up.pt>
@@ -215,7 +215,8 @@ SR_PRIV int mso_parse_serial(const char *iSerial, const char *iProduct,
 {
        unsigned int u1, u2, u3, u4, u5, u6;
 
-       iProduct = iProduct;
+       (void)iProduct;
+
        /* FIXME: This code is in the original app, but I think its
         * used only for the GUI */
        /*    if (strstr(iProduct, "REV_02") || strstr(iProduct, "REV_03"))
@@ -293,7 +294,7 @@ SR_PRIV void stop_acquisition(const struct sr_dev_inst *sdi)
        struct dev_context *devc;
 
        devc = sdi->priv;
-       sr_source_remove(devc->serial->fd);
+       serial_source_remove(devc->serial);
 
        /* Terminate session */
        packet.type = SR_DF_END;