|
@@ -1517,7 +1517,7 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm,
|
|
|
char prefixed_source[80];
|
|
|
int ret = 0;
|
|
|
|
|
|
- if (dapm->codec->name_prefix) {
|
|
|
+ if (dapm->codec && dapm->codec->name_prefix) {
|
|
|
snprintf(prefixed_sink, sizeof(prefixed_sink), "%s %s",
|
|
|
dapm->codec->name_prefix, route->sink);
|
|
|
sink = prefixed_sink;
|
|
@@ -2167,14 +2167,14 @@ int snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
|
|
|
return -ENOMEM;
|
|
|
|
|
|
name_len = strlen(widget->name) + 1;
|
|
|
- if (dapm->codec->name_prefix)
|
|
|
+ if (dapm->codec && dapm->codec->name_prefix)
|
|
|
name_len += 1 + strlen(dapm->codec->name_prefix);
|
|
|
w->name = kmalloc(name_len, GFP_KERNEL);
|
|
|
if (w->name == NULL) {
|
|
|
kfree(w);
|
|
|
return -ENOMEM;
|
|
|
}
|
|
|
- if (dapm->codec->name_prefix)
|
|
|
+ if (dapm->codec && dapm->codec->name_prefix)
|
|
|
snprintf(w->name, name_len, "%s %s",
|
|
|
dapm->codec->name_prefix, widget->name);
|
|
|
else
|