From: Gerhard Sittig <redacted>
Date: Sat, 22 May 2021 11:35:29 +0000 (+0200)
Subject: motech-lps-301: make better use of serial extract options helper
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=6b4bdfbde8a9bfc3891ad98a373aa7cea12aef76

motech-lps-301: make better use of serial extract options helper

Pre-assign default values before having user specified options scanned.
This avoids the necessity to post-process the result. Move the initial
assignment to where its corresponding update is to improve readability.
---

diff --git a/src/hardware/motech-lps-30x/api.c b/src/hardware/motech-lps-30x/api.c
index e4a1fb6b..31bbfa43 100644
--- a/src/hardware/motech-lps-30x/api.c
+++ b/src/hardware/motech-lps-30x/api.c
@@ -363,13 +363,12 @@ static GSList *do_scan(lps_modelid modelid, struct sr_dev_driver *drv, GSList *o
 
 	sdi = NULL;
 	devc = NULL;
-	conn = serialcomm = NULL;
 
 	/* Process and check options. */
+	conn = NULL;
+	serialcomm = SERIALCOMM;
 	if (sr_serial_extract_options(options, &conn, &serialcomm) != SR_OK)
 		return NULL;
-	if (!serialcomm)
-		serialcomm = SERIALCOMM;
 
 	/* Init serial port. */
 	serial = sr_serial_dev_inst_new(conn, serialcomm);