mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2026-03-11 05:33:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ucm: fix the device remove operation

Browse source 
- allow to remove device only from conflicting lists
- unify the error codes when the device is not found (ENODEV)

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2020-04-06 13:25:43 +02:00
parent 341326c21e
commit c9605484d1
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/ucm/utils.c
View file

@ -371,7 +371,7 @@ int uc_mgr_rename_in_dev_list(struct dev_list *dev_list, const char *src,
return 0; return 0;
} }
} }
return -ENOENT; return -ENODEV;
} }
int uc_mgr_remove_from_dev_list(struct dev_list *dev_list, const char *name) int uc_mgr_remove_from_dev_list(struct dev_list *dev_list, const char *name)
@ -528,17 +528,22 @@ int uc_mgr_remove_device(struct use_case_verb *verb, const char *name)
{ {
struct use_case_device *device; struct use_case_device *device;
struct list_head *pos, *npos; struct list_head *pos, *npos;
int err, found = 0;
list_for_each_safe(pos, npos, &verb->device_list) { list_for_each_safe(pos, npos, &verb->device_list) {
device = list_entry(pos, struct use_case_device, list); device = list_entry(pos, struct use_case_device, list);
if (strcmp(device->name, name) == 0) { if (strcmp(device->name, name) == 0) {
uc_mgr_free_device(device); uc_mgr_free_device(device);
found++;
continue; continue;
} }
uc_mgr_remove_from_dev_list(&device->dev_list, name); err = uc_mgr_remove_from_dev_list(&device->dev_list, name);
return 0; if (err < 0 && err != -ENODEV)
return err;
if (err == 0)
found++;
} }
return -ENOENT; return found == 0 ? -ENODEV : 0;
} }
void uc_mgr_free_verb(snd_use_case_mgr_t *uc_mgr) void uc_mgr_free_verb(snd_use_case_mgr_t *uc_mgr)