acp: fix port and profile name lookup

This commit is contained in:
Wim Taymans 2021-01-27 13:04:24 +01:00
parent cf35e52586
commit 64b078d7bb

View file

@ -807,11 +807,9 @@ uint32_t acp_card_find_best_profile_index(struct acp_card *card, const char *nam
struct acp_card_profile *p = profiles[i]; struct acp_card_profile *p = profiles[i];
if (name) { if (name) {
if (strcmp(name, p->name)) if (strcmp(name, p->name) == 0)
best = i; best = i;
continue; } else if (p->flags & ACP_PROFILE_OFF) {
}
if (p->flags & ACP_PROFILE_OFF) {
off = i; off = i;
} else if (p->available == ACP_AVAILABLE_YES) { } else if (p->available == ACP_AVAILABLE_YES) {
if (best == ACP_INVALID_INDEX || p->priority > profiles[best]->priority) if (best == ACP_INVALID_INDEX || p->priority > profiles[best]->priority)
@ -1579,11 +1577,9 @@ uint32_t acp_device_find_best_port_index(struct acp_device *dev, const char *nam
struct acp_port *p = ports[i]; struct acp_port *p = ports[i];
if (name) { if (name) {
if (strcmp(name, p->name)) if (strcmp(name, p->name) == 0)
best = i; best = i;
continue; } else if (p->available == ACP_AVAILABLE_YES) {
}
if (p->available == ACP_AVAILABLE_YES) {
if (best == ACP_INVALID_INDEX || p->priority > ports[best]->priority) if (best == ACP_INVALID_INDEX || p->priority > ports[best]->priority)
best = i; best = i;
} else if (p->available != ACP_AVAILABLE_NO) { } else if (p->available != ACP_AVAILABLE_NO) {