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

diff --combined sound/soc/codecs/tlv320aic3x.c
index d7349bc,b183510,5498393..e12fafb
--- 1/sound/soc/codecs/tlv320aic3x.c
--- 2/sound/soc/codecs/tlv320aic3x.c
--- 3/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@@@ -169,7 -169,7 -169,7 +169,7 @@@@ static int snd_soc_dapm_put_volsw_aic3x
        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;
@@@@ -1399,6 -1399,7 -1399,7 +1399,6 @@@@ static int aic3x_probe(struct snd_soc_c
        }
   
        aic3x_add_widgets(codec);
 --     list_add(&aic3x->list, &reset_list);
   
        return 0;
   
@@@@ -1568,13 -1569,7 -1569,7 +1568,13 @@@@ static int aic3x_i2c_probe(struct i2c_c
   
        ret = snd_soc_register_codec(&i2c->dev,
                        &soc_codec_dev_aic3x, &aic3x_dai, 1);
 --     return ret;
 ++
 ++     if (ret != 0)
 ++             goto err_gpio;
 ++
 ++     list_add(&aic3x->list, &reset_list);
 ++
 ++     return 0;
   
   err_gpio:
        if (gpio_is_valid(aic3x->gpio_reset) &&

diff --combined sound/soc/pxa/pxa-ssp.c
index 9b19ee7,dd35e7b,a3119a0..199a8b3
--- 1/sound/soc/pxa/pxa-ssp.c
--- 2/sound/soc/pxa/pxa-ssp.c
--- 3/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@@@ -34,6 -34,8 -34,8 +34,6 @@@@
   #include <sound/pxa2xx-lib.h>
   #include <sound/dmaengine_pcm.h>
   
 --#include <mach/hardware.h>
 --
   #include "../../arm/pxa2xx-pcm.h"
   #include "pxa-ssp.h"
   
@@@@ -808,6 -810,7 -810,6 +808,7 @@@@ static const struct snd_soc_component_d
   #ifdef CONFIG_OF
   static const struct of_device_id pxa_ssp_of_ids[] = {
        { .compatible = "mrvl,pxa-ssp-dai" },
+ +     {}
   };
   #endif