asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2025-01-02 23:49:47 +01:00
Code Issues Projects Releases Packages Wiki Activity

alsactl: state: verify only control count not numids

Browse source 
The numids may change. Verify if a control is added or removed.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2024-10-15 17:14:23 +02:00
parent e2fec28b65
commit 966c559f04
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
alsactl/state.c
View file

@ -1511,7 +1511,7 @@ static int set_controls(int card, snd_config_t *top, int doit)
snd_ctl_elem_id_t *elem_id; snd_ctl_elem_id_t *elem_id;
snd_config_t *control; snd_config_t *control;
snd_config_iterator_t i, next; snd_config_iterator_t i, next;
int err, maxnumid = -1, maxnumid2 = -1; int err, controls1 = -1, controls2 = -1;
unsigned int idx, count = 0; unsigned int idx, count = 0;
char name[32], tmpid[16]; char name[32], tmpid[16];
const char *id; const char *id;
@ -1551,11 +1551,13 @@ static int set_controls(int card, snd_config_t *top, int doit)
cerror(doit, "state.%s.control is not a compound\n", id); cerror(doit, "state.%s.control is not a compound\n", id);
return -EINVAL; return -EINVAL;
} }
controls1 = 0;
snd_config_for_each(i, next, control) { snd_config_for_each(i, next, control) {
snd_config_t *n = snd_config_iterator_entry(i); snd_config_t *n = snd_config_iterator_entry(i);
err = set_control(handle, n, doit); err = set_control(handle, n, doit);
if (err < 0 && (!force_restore || !doit)) if (err < 0 && (!force_restore || !doit))
goto _close; goto _close;
controls1++;
} }
if (doit) if (doit)
@ -1579,7 +1581,7 @@ static int set_controls(int card, snd_config_t *top, int doit)
error("Cannot determine controls (2): %s", snd_strerror(err)); error("Cannot determine controls (2): %s", snd_strerror(err));
goto _free; goto _free;
} }
maxnumid2 = 0; controls2 = 0;
/* skip non-readable elements */ /* skip non-readable elements */
for (idx = 0; idx < count; ++idx) { for (idx = 0; idx < count; ++idx) {
snd_ctl_elem_info_clear(elem_info); snd_ctl_elem_info_clear(elem_info);
@ -1588,19 +1590,19 @@ static int set_controls(int card, snd_config_t *top, int doit)
if (snd_ctl_elem_info(handle, elem_info) == 0) { if (snd_ctl_elem_info(handle, elem_info) == 0) {
if (!snd_ctl_elem_info_is_readable(elem_info)) if (!snd_ctl_elem_info_is_readable(elem_info))
continue; continue;
maxnumid2++; controls2++;
} }
} }
/* check if we have additional controls in driver */ /* check if we have additional controls in driver */
/* in this case we should go through init procedure */ /* in this case we should go through init procedure */
_check: _check:
dbg("maxnumid=%i maxnumid2=%i", maxnumid, maxnumid2); dbg("controls1=%i controls2=%i", controls1, controls2);
if (maxnumid >= 0 && maxnumid != maxnumid2) { if (controls1 >= 0 && controls1 != controls2) {
/* not very informative */ /* not very informative */
/* but value is used for check only */ /* but value is used for check only */
err = -EAGAIN; err = -EAGAIN;
dbg("more controls than maxnumid?"); dbg("config controls mismatch with hardware?");
} }
_free: _free: