From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 16 Apr 2009 13:14:35 +0000 (+0100)
Subject: Merge branch 'for-2.6.30' into for-2.6.31
X-Git-Tag: firefly_0821_release~12446^2~79^2~94
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8d98f2246d7c622198ae0b8ca66f1c82b8a25377;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-2.6.30' into for-2.6.31
---

8d98f2246d7c622198ae0b8ca66f1c82b8a25377
diff --cc sound/soc/omap/omap-mcbsp.c
index 2b4a8da09918,90f4df7fd906..4d6ef0bf71dd
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@@ -282,15 -276,14 +282,15 @@@ static int omap_mcbsp_dai_hw_params(str
  	}
  
  	/* Set FS period and length in terms of bit clock periods */
 -	switch (mcbsp_data->fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
 +	switch (format) {
  	case SND_SOC_DAIFMT_I2S:
 -		regs->srgr2	|= FPER(wlen * 2 - 1);
 +		regs->srgr2	|= FPER(wlen * channels - 1);
  		regs->srgr1	|= FWID(wlen - 1);
  		break;
 +	case SND_SOC_DAIFMT_DSP_A:
  	case SND_SOC_DAIFMT_DSP_B:
  		regs->srgr2	|= FPER(wlen * channels - 1);
- 		regs->srgr1	|= FWID(wlen * channels - 2);
+ 		regs->srgr1	|= FWID(0);
  		break;
  	}