diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:16 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:16 +0000 |
| commit | 8e37fcb624c7b7d9231393661421e58cbf3aa760 (patch) | |
| tree | 8179ca2d49c05a5dab5d6a182bc5121181db4d95 /sound | |
| parent | 810195256e941d5c657e64bc2bcefa7ee16d4a26 (diff) | |
| parent | dde109fb46256f61642ba9bf0199418dfaaca12b (diff) | |
Merge remote-tracking branch 'asoc/fix/davinci' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/davinci/davinci-mcasp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 55e2bf652be..9321e5c9d8c 100644 --- 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; /* |