diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-08 16:54:33 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-08 16:54:33 +0300 |
| commit | 5a4cfce73b7b48bdbb4e816124e5fcf84bc58e59 (patch) | |
| tree | 0d84d5096b34bfb794b52dc59271c184e9d3e4ea /sound/soc | |
| parent | 6b3ed78535c5af8c1d25ed7eaaea7557698843a1 (diff) | |
| parent | 2a7b1a00206895cfa444fd83477dca67a88a9d25 (diff) | |
| download | linux-5a4cfce73b7b48bdbb4e816124e5fcf84bc58e59.tar.xz | |
Merge branch 'for-2.6.37' into for-2.6.38
Conflicts:
sound/soc/soc-core.c
Axel's fix on two different branches.
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm8580.c | 8 | ||||
| -rw-r--r-- | sound/soc/codecs/wm8962.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c index cb7765f7687d..45efc9437ee8 100644 --- a/sound/soc/codecs/wm8580.c +++ b/sound/soc/codecs/wm8580.c @@ -491,16 +491,16 @@ static int wm8580_paif_hw_params(struct snd_pcm_substream *substream, paifa |= 0x8; break; case SNDRV_PCM_FORMAT_S20_3LE: - paifa |= 0x10; + paifa |= 0x0; paifb |= WM8580_AIF_LENGTH_20; break; case SNDRV_PCM_FORMAT_S24_LE: - paifa |= 0x10; + paifa |= 0x0; paifb |= WM8580_AIF_LENGTH_24; break; case SNDRV_PCM_FORMAT_S32_LE: - paifa |= 0x10; - paifb |= WM8580_AIF_LENGTH_24; + paifa |= 0x0; + paifb |= WM8580_AIF_LENGTH_32; break; default: return -EINVAL; diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index cf4b2722648a..f0c9d2691842 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -3339,7 +3339,7 @@ static irqreturn_t wm8962_irq(int irq, void *data) int mask; int active; - mask = snd_soc_read(codec, WM8962_INTERRUPT_STATUS_2); + mask = snd_soc_read(codec, WM8962_INTERRUPT_STATUS_2_MASK); active = snd_soc_read(codec, WM8962_INTERRUPT_STATUS_2); active &= ~mask; |