X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi%2Fscpi_libgpib.c;h=2f3256be948e2eae404d02cda0e38b4391bab465;hb=05b0cc416fbfe95fb6440a786942a61dc1eeac52;hp=ed499cca5bad7bacd0e1e1fa07b70fc4ab7041a9;hpb=daf13c570f3532a702401363a35195970600c046;p=libsigrok.git

diff --git a/src/scpi/scpi_libgpib.c b/src/scpi/scpi_libgpib.c
index ed499cca..2f3256be 100644
--- a/src/scpi/scpi_libgpib.c
+++ b/src/scpi/scpi_libgpib.c
@@ -118,8 +118,9 @@ static int scpi_gpib_read_data(void *priv, char *buf, int maxlen)
 
 	if (ibsta & ERR)
 	{
-		sr_err("Error while reading SCPI response: iberr = %s.",
-		        gpib_error_string(iberr));
+		sr_err("Error while reading SCPI response: "
+			"iberr = %s, ibsta = %d.",
+			gpib_error_string(iberr), ibsta);
 		return SR_ERR;
 	}
 
@@ -139,6 +140,9 @@ static int scpi_gpib_close(struct sr_scpi_dev_inst *scpi)
 {
 	struct scpi_gpib *gscpi = scpi->priv;
 
+	/* Put device in back local mode to prevent lock-out of front panel. */
+	ibloc(gscpi->descriptor);
+	/* Now it's safe to close the handle. */
 	ibonl(gscpi->descriptor, 0);
 
 	return SR_OK;