Commit bad6f621 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents cee429e5 4c715c75 e6c111fa

sound/soc/codecs/tlv320aic3x.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

sound/soc/pxa/pxa-ssp.c

+1 −0
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE