Add sr_dev_acquisition_stop(), factor out SR_ERR_DEV_CLOSED check.

[libsigrok.git] / src / session.c

diff --git a/src/session.c b/src/session.c
index c88e48c74e49c159c85fdc0e946d7774e4e3f1a2..1843fd17b9f58bf248a58a66b6852f960d5215af 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -830,7 +830,7 @@ SR_API int sr_session_start(struct sr_session *session)
                lend = l->next;
                for (l = session->devs; l != lend; l = l->next) {
                        sdi = l->data;
-                       sdi->driver->dev_acquisition_stop(sdi);
+                       sr_dev_acquisition_stop(sdi);
                }
                /* TODO: Handle delayed stops. Need to iterate the event
                 * sources... */
@@ -913,8 +913,7 @@ static gboolean session_stop_sync(void *user_data)
 
        for (node = session->devs; node; node = node->next) {
                sdi = node->data;
-               if (sdi->driver && sdi->driver->dev_acquisition_stop)
-                       sdi->driver->dev_acquisition_stop(sdi);
+               sr_dev_acquisition_stop(sdi);
        }
 
        return G_SOURCE_REMOVE;