sr: driver struct gets a more generic *priv instead of GSList *instances

[libsigrok.git] / session.c

diff --git a/session.c b/session.c
index 9818ee25eef965f6647bd48219d659602a120377..23e4e49559739d74740ab2b1aacdd74998f1b6d5 100644 (file)
--- a/session.c
+++ b/session.c
@@ -88,7 +88,7 @@ SR_API int sr_session_destroy(void)
 
 static void sr_dev_close(struct sr_dev_inst *sdi)
 {
-       if (sdi->driver->dev_close)
+       if (sdi->driver && sdi->driver->dev_close)
                sdi->driver->dev_close(sdi);
 }
 
@@ -456,14 +456,15 @@ static int _sr_session_source_add(GPollFD *pollfd, int timeout,
 
        /* Note: cb_data can be NULL, that's not a bug. */
 
-       new_pollfds = g_try_realloc(session->pollfds, sizeof(GPollFD) * (session->num_sources + 1));
+       new_pollfds = g_try_realloc(session->pollfds,
+                       sizeof(GPollFD) * (session->num_sources + 1));
        if (!new_pollfds) {
                sr_err("session: %s: new_pollfds malloc failed", __func__);
                return SR_ERR_MALLOC;
        }
 
        new_sources = g_try_realloc(session->sources, sizeof(struct source) *
-       (session->num_sources + 1));
+                       (session->num_sources + 1));
        if (!new_sources) {
                sr_err("session: %s: new_sources malloc failed", __func__);
                return SR_ERR_MALLOC;