Unverified Commit d33f1020 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/core' into asoc-next

parents 8c2ab73f b9f902b7

sound/soc/soc-core.c

+4 −2
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static umode_t soc_dev_attr_is_visible(struct kobject *kobj, 


	if (attr == &dev_attr_pmdown_time.attr)

		return attr->mode; /* always visible */

	return rtd->codec ? attr->mode : 0; /* enabled only with codec */

	return rtd->num_codecs ? attr->mode : 0; /* enabled only with codec */

}



static const struct attribute_group soc_dapm_dev_group = {
@@ -1945,7 +1945,9 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd, 
	}



	/* Flip the polarity for the "CPU" end of a CODEC<->CODEC link */

	if (cpu_dai->codec) {

	/* the component which has non_legacy_dai_naming is Codec */

	if (cpu_dai->codec ||

	    cpu_dai->component->driver->non_legacy_dai_naming) {

		unsigned int inv_dai_fmt;



		inv_dai_fmt = dai_fmt & ~SND_SOC_DAIFMT_MASTER_MASK;

sound/soc/soc-ops.c

+2 −2
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ int snd_soc_get_volsw_sx(struct snd_kcontrol *kcontrol, 
	unsigned int rshift = mc->rshift;

	int max = mc->max;

	int min = mc->min;

	int mask = (1 << (fls(min + max) - 1)) - 1;

	unsigned int mask = (1 << (fls(min + max) - 1)) - 1;

	unsigned int val;

	int ret;
@@ -423,7 +423,7 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, 
	unsigned int rshift = mc->rshift;

	int max = mc->max;

	int min = mc->min;

	int mask = (1 << (fls(min + max) - 1)) - 1;

	unsigned int mask = (1 << (fls(min + max) - 1)) - 1;

	int err = 0;

	unsigned int val, val_mask, val2 = 0;