From: Uwe Hermann <redacted>
Date: Mon, 31 Dec 2012 20:21:39 +0000 (+0100)
Subject: asix-sigma: Fix two compiler warnings.
X-Git-Tag: dsupstream~393
X-Git-Url: https://sigrok.org/gitweb/?a=commitdiff_plain;h=f4abaa9f6b37d07bd565c74a60139d641e86b1d1;hp=b7c3e8499c9dc499874876efdf5fb499368d6f10;p=libsigrok.git

asix-sigma: Fix two compiler warnings.

asix-sigma.c:648:9: warning: 'ret' may be used uninitialized in this
function [-Wmaybe-uninitialized]

asix-sigma.c:1337:20: warning: 'triggerselect' may be used uninitialized
in this function [-Wmaybe-uninitialized]
---

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index 27a91226..8ff2e159 100644
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -648,6 +648,8 @@ static int set_samplerate(const struct sr_dev_inst *sdi, uint64_t samplerate)
 	int i, ret;
 	struct dev_context *devc = sdi->priv;
 
+	ret = SR_OK;
+
 	for (i = 0; supported_samplerates[i]; i++) {
 		if (supported_samplerates[i] == samplerate)
 			break;
@@ -1278,7 +1280,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	struct sr_datafeed_meta_logic meta;
 	struct clockselect_50 clockselect;
 	int frac, triggerpin, ret;
-	uint8_t triggerselect;
+	uint8_t triggerselect = 0;
 	struct triggerinout triggerinout_conf;
 	struct triggerlut lut;