From 5eab4faf048b3cf6bbb18cdd61118bbc21177895 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 22 Jul 1999 10:49:40 +0000 Subject: [PATCH] More mixer updates and some fixes... --- alsactl/merge.c | 4 ++-- amixer/amixer.c | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/alsactl/merge.c b/alsactl/merge.c index 94ebbd7..1ff6248 100644 --- a/alsactl/merge.c +++ b/alsactl/merge.c @@ -143,7 +143,7 @@ int soundcard_setup_merge_switches(int cardno) continue; soundcard_setup_merge_sw(soundcard->control.switches, rsoundcard->control.switches, soundcard->no, -1, "control"); for (rmixer = rsoundcard->mixers; rmixer; rmixer = rmixer->next) { - for (mixer = soundcard->mixers; mixer; mixer = rmixer->next) { + for (mixer = soundcard->mixers; mixer; mixer = mixer->next) { if (!strncmp(mixer->info.name, rmixer->info.name, sizeof(mixer->info.name))) break; } @@ -350,7 +350,7 @@ int soundcard_setup_merge_data(int cardno) if (cardno >= 0 && soundcard->no != cardno) continue; for (rmixer = rsoundcard->mixers; rmixer; rmixer = rmixer->next) { - for (mixer = soundcard->mixers; mixer; mixer = rmixer->next) { + for (mixer = soundcard->mixers; mixer; mixer = mixer->next) { if (!strncmp(mixer->info.name, rmixer->info.name, sizeof(mixer->info.name))) break; } diff --git a/amixer/amixer.c b/amixer/amixer.c index aa40bdb..6520d75 100644 --- a/amixer/amixer.c +++ b/amixer/amixer.c @@ -1463,7 +1463,11 @@ int main(int argc, char *argv[]) break; case 'd': case HELPID_DEVICE: - device = device; + device = atoi(optarg); + if (device < 0 || device > 32) { + fprintf(stderr, "Error: device %i is invalid\n", device); + return 1; + } break; case 'q': case HELPID_QUIET: