Skip to content

L
linux
Commit bad6f621 authored by Mark Brown's avatar Mark Brown
Browse files
Options

Merge remote-tracking branches 'asoc/fix/pxa' and 'asoc/fix/tlv320aic3x' into asoc-linus

parents cee429e5 4c715c75 e6c111fa
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
sound/soc/codecs/tlv320aic3x.c
View file @ bad6f621
...@@ -169,7 +169,7 @@ static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol, ...@@ -169,7 +169,7 @@ static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol,
mask <<= shift; mask <<= shift;
val <<= shift; val <<= shift;
change = snd_soc_test_bits(codec, val, mask, reg); change = snd_soc_test_bits(codec, reg, mask, val);
if (change) { if (change) {
update.kcontrol = kcontrol; update.kcontrol = kcontrol;
update.reg = reg; update.reg = reg;
......
sound/soc/pxa/pxa-ssp.c
View file @ bad6f621
...@@ -808,6 +808,7 @@ static const struct snd_soc_component_driver pxa_ssp_component = { ...@@ -808,6 +808,7 @@ static const struct snd_soc_component_driver pxa_ssp_component = {
#ifdef CONFIG_OF #ifdef CONFIG_OF
static const struct of_device_id pxa_ssp_of_ids[] = { static const struct of_device_id pxa_ssp_of_ids[] = {
{ .compatible = "mrvl,pxa-ssp-dai" }, { .compatible = "mrvl,pxa-ssp-dai" },
{}
}; };
#endif #endif
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7