2 files changed, 2 insertions, 1 deletions

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index d7349bc89ad3..e12fafbb1e09 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -169,7 +169,7 @@ static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol,
         mask <<= shift;
         val <<= shift;
 
-        change = snd_soc_test_bits(codec, val, mask, reg);
+        change = snd_soc_test_bits(codec, reg, mask, val);
         if (change) {
                 update.kcontrol = kcontrol;
                 update.reg = reg;
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index 9b19ee70291f..199a8b377553 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -808,6 +808,7 @@ static const struct snd_soc_component_driver pxa_ssp_component = {
 #ifdef CONFIG_OF
 static const struct of_device_id pxa_ssp_of_ids[] = {
         { .compatible = "mrvl,pxa-ssp-dai" },
+        {}
 };
 #endif