alsactl: Fix restore / init call behaviour when driver contains more controls

Fix check when driver contains more controls than state file. In this case,
initialization procedure should be run, too.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/alsactl/state.c b/alsactl/state.c
index 467fa93bdcd5c602a5e8ca326198710fd4627919..635a9992ad63fb6d351e8e4dd488ecafb340650a 100644 (file)
--- a/alsactl/state.c
+++ b/alsactl/state.c
@@ -1162,7 +1162,7 @@ static int set_control(snd_ctl_t *handle, snd_config_t *control,
                return -EINVAL;
        }
        numid = atoi(id);
-       if (numid > *maxnumid)
+       if ((int)numid > *maxnumid)
                *maxnumid = numid;
        snd_config_for_each(i, next, control) {
                snd_config_t *n = snd_config_iterator_entry(i);
@@ -1398,7 +1398,7 @@ static int set_controls(int card, snd_config_t *top, int doit)
        snd_ctl_card_info_t *info;
        snd_config_t *control;
        snd_config_iterator_t i, next;
-       int err, maxnumid;
+       int err, maxnumid = -1;
        char name[32], tmpid[16];
        const char *id;
        snd_ctl_card_info_alloca(&info);
@@ -1442,7 +1442,7 @@ static int set_controls(int card, snd_config_t *top, int doit)
 
        /* check if we have additional controls in driver */
        /* in this case we should go through init procedure */
-       if (!doit) {
+       if (!doit && maxnumid >= 0) {
                snd_ctl_elem_id_t *id;
                snd_ctl_elem_info_t *info;
                snd_ctl_elem_id_alloca(&id);