aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-09-30 15:08:04 +0200
committerTakashi Iwai <tiwai@suse.de>2008-09-30 15:08:04 +0200
commit4de71dfea0d5d683e0311fb488e00485934c6821 (patch)
tree670f6be407ff6007acc4c5cf695fa1f9b8758053
parent3b65e15181cc30ff24cf9457545f50689b7949f1 (diff)
downloadsalsa-lib-4de71dfea0d5d683e0311fb488e00485934c6821.tar.gz
Fix snd_card_get_index() to handle the string x,y properly
-rw-r--r--src/cards.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/cards.c b/src/cards.c
index d094dc5..5a90329 100644
--- a/src/cards.c
+++ b/src/cards.c
@@ -99,10 +99,7 @@ int snd_card_get_index(const char *string)
if (!string || *string == '\0')
return -EINVAL;
- if ((isdigit(*string) && *(string + 1) == 0) ||
- (isdigit(*string) && isdigit(*(string + 1)) && *(string + 2) == 0)) {
- if (sscanf(string, "%i", &card) != 1)
- return -EINVAL;
+ if (sscanf(string, "%i", &card) == 1) {
if (card < 0 || card > 31)
return -EINVAL;
if (snd_card_load(card))