Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

Mark Brown 11 years ago
parent
cee429e5c5 4c715c758c e6c111fac4
commit
bad6f621e4
2 changed files with 2 additions and 1 deletions
Unified View Show Diff Stats
  1. 1 1
      sound/soc/codecs/tlv320aic3x.c
  2. 1 0
      sound/soc/pxa/pxa-ssp.c

+ 1 - 1
sound/soc/codecs/tlv320aic3x.c
View File 

@@ -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;

+ 1 - 0
sound/soc/pxa/pxa-ssp.c
View File 

@@ -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