Merge remote-tracking branch 'asoc/fix/davinci' into asoc-next

8e37fcb6 · Mark Brown · 81019525 · dde109fb · 8e37fcb6
Commit 8e37fcb6 authored Feb 11, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/soc/davinci/davinci-mcasp.c sound/soc/davinci/davinci-mcasp.c +1 -1

No files found.
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -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;

 	/*