From: Daniel Ribeiro <redacted>
Date: Sat, 22 Jan 2011 14:23:34 +0000 (-0200)
Subject: alsa: hide a few compiler warnings
X-Git-Tag: libsigrok-0.1.0~381
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=cdbc51d97d027c3889aad43c9d9ed3344cfb5a91;p=libsigrok.git

alsa: hide a few compiler warnings
---

diff --git a/hardware/alsa/alsa.c b/hardware/alsa/alsa.c
index b41d8ed3..e4cab1e0 100644
--- a/hardware/alsa/alsa.c
+++ b/hardware/alsa/alsa.c
@@ -78,7 +78,7 @@ static int hw_opendev(int device_index)
 	struct alsa *alsa;
 	int err;
 
-	if (!(sdi = get_sigrok_device_instance(device_instances, 0)))
+	if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
 		return SIGROK_ERR;
 	alsa = sdi->priv;
 
@@ -112,7 +112,7 @@ static void hw_closedev(int device_index)
 	struct sigrok_device_instance *sdi;
 	struct alsa *alsa;
 
-	if (!(sdi = get_sigrok_device_instance(device_instances, 0)))
+	if (!(sdi = get_sigrok_device_instance(device_instances, device_index)))
 		return;
 	alsa = sdi->priv;
 	if (!alsa)
@@ -211,6 +211,9 @@ static int receive_data(int fd, int revents, void *user_data)
 	char inb[4096];
 	int i, x, count;
 
+	fd = fd;
+	revents = revents;
+
 	do {
 		memset(inb, 0, sizeof(inb));
 		count = snd_pcm_readi(alsa->capture_handle, inb,