mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 08:46:46 +00:00
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
This commit is contained in:
commit
08d0a9757d
1 changed files with 2 additions and 3 deletions
|
@ -2733,7 +2733,7 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol,
|
||||||
}
|
}
|
||||||
|
|
||||||
mutex_unlock(&card->dapm_mutex);
|
mutex_unlock(&card->dapm_mutex);
|
||||||
return 0;
|
return change;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(snd_soc_dapm_put_volsw);
|
EXPORT_SYMBOL_GPL(snd_soc_dapm_put_volsw);
|
||||||
|
|
||||||
|
@ -2861,7 +2861,6 @@ int snd_soc_dapm_put_enum_virt(struct snd_kcontrol *kcontrol,
|
||||||
struct soc_enum *e =
|
struct soc_enum *e =
|
||||||
(struct soc_enum *)kcontrol->private_value;
|
(struct soc_enum *)kcontrol->private_value;
|
||||||
int change;
|
int change;
|
||||||
int ret = 0;
|
|
||||||
int wi;
|
int wi;
|
||||||
|
|
||||||
if (ucontrol->value.enumerated.item[0] >= e->max)
|
if (ucontrol->value.enumerated.item[0] >= e->max)
|
||||||
|
@ -2881,7 +2880,7 @@ int snd_soc_dapm_put_enum_virt(struct snd_kcontrol *kcontrol,
|
||||||
}
|
}
|
||||||
|
|
||||||
mutex_unlock(&card->dapm_mutex);
|
mutex_unlock(&card->dapm_mutex);
|
||||||
return ret;
|
return change;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(snd_soc_dapm_put_enum_virt);
|
EXPORT_SYMBOL_GPL(snd_soc_dapm_put_enum_virt);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue