Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: alsa-devel@alsa-project.org
Subject: [PATCH lib 2/5] namehint: Fix the listing without device number
Date: Thu, 30 Apr 2015 15:06:15 +0200	[thread overview]
Message-ID: <1430399178-15173-3-git-send-email-tiwai@suse.de> (raw)
In-Reply-To: <1430399178-15173-1-git-send-email-tiwai@suse.de>

The current code of snd_device_name_hint() has a bug when listing up
devices without the device index (e.g. ctl).  Because it assigns the
default device index 0 unconditionally and it has a check at the later
point to filter entries with dev >= 0, it ended up with empty
outputs.

The fix is simply to remove the bogus assignment of dev = 0.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 src/control/namehint.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/control/namehint.c b/src/control/namehint.c
index 66de634d3550..6c04143a185c 100644
--- a/src/control/namehint.c
+++ b/src/control/namehint.c
@@ -272,7 +272,6 @@ static int try_config(snd_config_t *config,
 	if (snd_config_search(cfg1, "type", &cfg) >= 0 &&
 	    snd_config_get_string(cfg, &str) >= 0 &&
 	    strcmp(str, "hw") == 0) {
-	    	dev = 0;
 		list->device_input = -1;
 		list->device_output = -1;
 		if (snd_config_search(cfg1, "device", &cfg) >= 0) {
-- 
2.3.6

  parent reply	other threads:[~2015-04-30 13:06 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-30 13:06 [PATCH lib 0/5] alsa-lib namehint fixes Takashi Iwai
2015-04-30 13:06 ` [PATCH lib 1/5] namehint: Fix invalid list access in snd_device_name_hint() Takashi Iwai
2015-04-30 13:06 ` Takashi Iwai [this message]
2015-04-30 13:06 ` [PATCH lib 3/5] namehint: Fix bad free with invalid iface name Takashi Iwai
2015-04-30 13:06 ` [PATCH lib 4/5] Allow hint for ctl, hwdep, timer and seq Takashi Iwai
2015-04-30 13:06 ` [PATCH lib 5/5] conf: Add hint descriptions to ctl, hwdep, seq and timer devices Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1430399178-15173-3-git-send-email-tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=alsa-devel@alsa-project.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox