43 lines
1.2 KiB
Diff
43 lines
1.2 KiB
Diff
|
From 9baf64da2f26844434ecea4825052937a3abe06c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
||
|
|
Date: Fri, 29 Nov 2019 22:28:26 +0100
|
||
|
|
Subject: [PATCH 02/30] ucm: return always at least NULL if no list is
|
||
|
|
available in snd_use_case_get_list()
|
||
|
|
|
||
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||
|
|
---
|
||
|
|
src/ucm/main.c | 8 ++++++--
|
||
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/ucm/main.c b/src/ucm/main.c
|
||
|
|
index 252e50d9a387..b80db65fa93b 100644
|
||
|
|
--- a/src/ucm/main.c
|
||
|
|
+++ b/src/ucm/main.c
|
||
|
|
@@ -1160,8 +1160,10 @@ static int get_supcon_device_list(snd_use_case_mgr_t *uc_mgr,
|
||
|
|
|
||
|
|
modifier = find_modifier(uc_mgr, verb, name, 0);
|
||
|
|
if (modifier) {
|
||
|
|
- if (modifier->dev_list.type != type)
|
||
|
|
+ if (modifier->dev_list.type != type) {
|
||
|
|
+ *list = NULL;
|
||
|
|
return 0;
|
||
|
|
+ }
|
||
|
|
return get_list(&modifier->dev_list.list, list,
|
||
|
|
struct dev_list_node, list,
|
||
|
|
name);
|
||
|
|
@@ -1169,8 +1171,10 @@ static int get_supcon_device_list(snd_use_case_mgr_t *uc_mgr,
|
||
|
|
|
||
|
|
device = find_device(uc_mgr, verb, name, 0);
|
||
|
|
if (device) {
|
||
|
|
- if (device->dev_list.type != type)
|
||
|
|
+ if (device->dev_list.type != type) {
|
||
|
|
+ *list = NULL;
|
||
|
|
return 0;
|
||
|
|
+ }
|
||
|
|
return get_list(&device->dev_list.list, list,
|
||
|
|
struct dev_list_node, list,
|
||
|
|
name);
|
||
|
|
--
|
||
|
|
2.16.4
|
||
|
|
|