More mixer updates and some fixes...

diff --git a/alsactl/merge.c b/alsactl/merge.c
index 94ebbd75a48b23410e11df2522da8bf84861b25e..1ff6248333449578ddf42a04cc1a550ab6e360b8 100644 (file)
--- 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 aa40bdbd9fec6ae87acc14830e7f702ee9e14000..6520d75594d89ef0d75db9471085f8a9f303e5cf 100644 (file)
--- 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: