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

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

parents 70fff743 72c38184

include/sound/soc.h

+1 −1
Original line number Diff line number Diff line
@@ -839,7 +839,7 @@ struct snd_soc_component_driver { 
	/* bits */

	unsigned int idle_bias_on:1;

	unsigned int suspend_bias_off:1;

	unsigned int pmdown_time:1; /* care pmdown_time at stop */

	unsigned int use_pmdown_time:1; /* care pmdown_time at stop */

	unsigned int endianness:1;

	unsigned int non_legacy_dai_naming:1;

};

sound/soc/soc-pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ bool snd_soc_runtime_ignore_pmdown_time(struct snd_soc_pcm_runtime *rtd) 
	for_each_rtdcom(rtd, rtdcom) {

		component = rtdcom->component;



		ignore &= !component->driver->pmdown_time;

		ignore &= !component->driver->use_pmdown_time;

	}



	/* this will be removed */