|
@@ -724,18 +724,14 @@ static int dapm_connect_mux(struct snd_soc_dapm_context *dapm,
|
|
|
item = 0;
|
|
|
}
|
|
|
|
|
|
- for (i = 0; i < e->items; i++) {
|
|
|
- if (!(strcmp(control_name, e->texts[i]))) {
|
|
|
- path->name = e->texts[i];
|
|
|
- if (i == item)
|
|
|
- path->connect = 1;
|
|
|
- else
|
|
|
- path->connect = 0;
|
|
|
- return 0;
|
|
|
- }
|
|
|
- }
|
|
|
+ i = match_string(e->texts, e->items, control_name);
|
|
|
+ if (i < 0)
|
|
|
+ return -ENODEV;
|
|
|
+
|
|
|
+ path->name = e->texts[i];
|
|
|
+ path->connect = (i == item);
|
|
|
+ return 0;
|
|
|
|
|
|
- return -ENODEV;
|
|
|
}
|
|
|
|
|
|
/* set up initial codec paths */
|