summaryrefslogtreecommitdiff
path: root/sound/soc/omap
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-01-18 12:18:23 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-20 13:58:31 +0000
commit7df6f2551f2255f55adab7338a3a1e6594a12f63 (patch)
treeb5f2fe9aea3ca77e589a39e9f38786f7c20a92b2 /sound/soc/omap
parent8819f65ceca118561c9d59a04cfd91625c74a262 (diff)
downloadkernel-common-7df6f2551f2255f55adab7338a3a1e6594a12f63.tar.gz
kernel-common-7df6f2551f2255f55adab7338a3a1e6594a12f63.tar.bz2
kernel-common-7df6f2551f2255f55adab7338a3a1e6594a12f63.zip
ASoC: omap-dmic: Use core to set the msbits constraint
Core can set the msbits constraint in behalf of the dai. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/omap')
-rw-r--r--sound/soc/omap/omap-dmic.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c
index 0855c1cfa7fd..4dcb5a7e40e8 100644
--- a/sound/soc/omap/omap-dmic.c
+++ b/sound/soc/omap/omap-dmic.c
@@ -113,12 +113,10 @@ static int omap_dmic_dai_startup(struct snd_pcm_substream *substream,
mutex_lock(&dmic->mutex);
- if (!dai->active) {
- snd_pcm_hw_constraint_msbits(substream->runtime, 0, 32, 24);
+ if (!dai->active)
dmic->active = 1;
- } else {
+ else
ret = -EBUSY;
- }
mutex_unlock(&dmic->mutex);
@@ -445,6 +443,7 @@ static struct snd_soc_dai_driver omap_dmic_dai = {
.channels_max = 6,
.rates = SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_192000,
.formats = SNDRV_PCM_FMTBIT_S32_LE,
+ .sig_bits = 24,
},
.ops = &omap_dmic_dai_ops,
};