Merge remote-tracking branch 'asoc/fix/davinci' into asoc-next (8e37fcb6) · Commits · e / devices / android_kernel_teracube_mt6765

sound/soc/davinci/davinci-mcasp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -626,7 +626,7 @@ static int davinci_config_channel_size(struct davinci_audio_dev *dev,
		int word_length)
		{
		u32 fmt;
		u32 rotate = (32 - word_length) / 4;
		u32 rotate = (word_length / 4) & 0x7;
		u32 mask = (1ULL << word_length) - 1;

		/*