Commit 2022d24e authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus

parents 388f7b1d 41d80025
...@@ -310,7 +310,7 @@ struct dapm_kcontrol_data { ...@@ -310,7 +310,7 @@ struct dapm_kcontrol_data {
}; };
static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget, static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget,
struct snd_kcontrol *kcontrol) struct snd_kcontrol *kcontrol, const char *ctrl_name)
{ {
struct dapm_kcontrol_data *data; struct dapm_kcontrol_data *data;
struct soc_mixer_control *mc; struct soc_mixer_control *mc;
...@@ -333,7 +333,7 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget, ...@@ -333,7 +333,7 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget,
if (mc->autodisable) { if (mc->autodisable) {
struct snd_soc_dapm_widget template; struct snd_soc_dapm_widget template;
name = kasprintf(GFP_KERNEL, "%s %s", kcontrol->id.name, name = kasprintf(GFP_KERNEL, "%s %s", ctrl_name,
"Autodisable"); "Autodisable");
if (!name) { if (!name) {
ret = -ENOMEM; ret = -ENOMEM;
...@@ -371,7 +371,7 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget, ...@@ -371,7 +371,7 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget,
if (e->autodisable) { if (e->autodisable) {
struct snd_soc_dapm_widget template; struct snd_soc_dapm_widget template;
name = kasprintf(GFP_KERNEL, "%s %s", kcontrol->id.name, name = kasprintf(GFP_KERNEL, "%s %s", ctrl_name,
"Autodisable"); "Autodisable");
if (!name) { if (!name) {
ret = -ENOMEM; ret = -ENOMEM;
...@@ -871,7 +871,7 @@ static int dapm_create_or_share_kcontrol(struct snd_soc_dapm_widget *w, ...@@ -871,7 +871,7 @@ static int dapm_create_or_share_kcontrol(struct snd_soc_dapm_widget *w,
kcontrol->private_free = dapm_kcontrol_free; kcontrol->private_free = dapm_kcontrol_free;
ret = dapm_kcontrol_data_alloc(w, kcontrol); ret = dapm_kcontrol_data_alloc(w, kcontrol, name);
if (ret) { if (ret) {
snd_ctl_free_one(kcontrol); snd_ctl_free_one(kcontrol);
goto exit_free; goto exit_free;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment