From 83dbd9f09caa400b09fdb699a34f728f1a33b58a Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Sun, 2 Feb 2014 22:09:01 +0100 Subject: [PATCH] rigol-ds: properly deal with dev_close() getting called multiple times --- hardware/rigol-ds/api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hardware/rigol-ds/api.c b/hardware/rigol-ds/api.c index f61d58ca..ae14f067 100644 --- a/hardware/rigol-ds/api.c +++ b/hardware/rigol-ds/api.c @@ -482,8 +482,8 @@ static int dev_close(struct sr_dev_inst *sdi) struct sr_scpi_dev_inst *scpi; struct dev_context *devc; - if (sdi->status != SR_ST_INACTIVE) - return SR_OK; + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR_DEV_CLOSED; scpi = sdi->conn; devc = sdi->priv;