Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus (12a04231) · Commits · e / devices / android_kernel_teracube_2e

sound/soc/soc-dapm.c

+8 −3

Original line number	Diff line number	Diff line
		@@ -3100,11 +3100,16 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
		}

		prefix = soc_dapm_prefix(dapm);
		if (prefix)
		if (prefix) {
		w->name = kasprintf(GFP_KERNEL, "%s %s", prefix, widget->name);
		else
		if (widget->sname)
		w->sname = kasprintf(GFP_KERNEL, "%s %s", prefix,
		widget->sname);
		} else {
		w->name = kasprintf(GFP_KERNEL, "%s", widget->name);

		if (widget->sname)
		w->sname = kasprintf(GFP_KERNEL, "%s", widget->sname);
		}
		if (w->name == NULL) {
		kfree(w);
		return NULL;