config_get(): Don't check for sdi->priv != NULL.

[libsigrok.git] / src / hardware / rigol-ds / api.c

diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
index 7f45e1874173601129d4eeb1ae3a0b5edc1fb82e..a88d1ba276b6f179078b5525910511a54700a5a6 100644 (file)
--- a/src/hardware/rigol-ds/api.c
+++ b/src/hardware/rigol-ds/api.c
@@ -501,9 +501,11 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
        int idx = -1;
        unsigned i;
 
-       if (!sdi || !(devc = sdi->priv))
+       if (!sdi)
                return SR_ERR_ARG;
 
+       devc = sdi->priv;
+
        /* If a channel group is specified, it must be a valid one. */
        if (cg && !g_slist_find(sdi->channel_groups, cg)) {
                sr_err("Invalid channel group specified.");
@@ -632,8 +634,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        const char *tmp_str;
        char buffer[16];
 
-       if (!(devc = sdi->priv))
-               return SR_ERR_ARG;
+       devc = sdi->priv;
 
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;