diff options
| author | Ramesh Babu K V <ramesh.babu@intel.com> | 2012-03-19 11:52:43 +0530 |
|---|---|---|
| committer | buildbot <buildbot@intel.com> | 2012-03-27 09:14:38 -0700 |
| commit | 7ee49046926107b4d7f4adb08b6494119d2893aa (patch) | |
| tree | 9175e8a03174e2fa21c9857d933c18cd35008949 /sound/soc | |
| parent | 05f403fe9e20d866791bdbae201e7230a9d1250d (diff) | |
| download | kernel-mfld-blackbay-7ee49046926107b4d7f4adb08b6494119d2893aa.tar.gz kernel-mfld-blackbay-7ee49046926107b4d7f4adb08b6494119d2893aa.tar.bz2 kernel-mfld-blackbay-7ee49046926107b4d7f4adb08b6494119d2893aa.zip | |
audio:remove mutual exclusion check between codec PCM ports
BZ: 24619
Currently the platform driver make sure that either PCM1
or PCM2 is opened at a time. This condition was added to
to make sure that both ports are opened with same
base frequency.
Allow both PCM1 and PCM2 to operate at same time. However
application has to open both ports with the same base frequency.
If app opens the ports with different base frequency, then
there will be undesirable results.
Driver needs to implement alsa way of handling the frequency constraint
between different dais.
Change-Id: Ic2cc292a0048afac14fea64164f06300eae57653
Signed-off-by: Ramesh Babu K V <ramesh.babu@intel.com>
Reviewed-on: http://android.intel.com:8080/39528
Reviewed-by: Agarwal, Vaibhav <vaibhav.agarwal@intel.com>
Reviewed-by: Abdullah, Omair M <omair.m.abdullah@intel.com>
Reviewed-by: Hibare, PramodX <pramodx.hibare@intel.com>
Tested-by: Hibare, PramodX <pramodx.hibare@intel.com>
Reviewed-by: Koul, Vinod <vinod.koul@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/mid-x86/sst_platform.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sound/soc/mid-x86/sst_platform.c b/sound/soc/mid-x86/sst_platform.c index 1efae7d087a..49d1e96c877 100644 --- a/sound/soc/mid-x86/sst_platform.c +++ b/sound/soc/mid-x86/sst_platform.c @@ -306,10 +306,6 @@ static int sst_platform_open(struct snd_pcm_substream *substream) runtime = substream->runtime; runtime->hw = sst_platform_pcm_hw; if (!strcmp(dai_link->cpu_dai_name, SST_VOICE_DAI)) { - if (sst_cpu_ctx->active_nonvoice_cnt > 0) { - pr_err("music/vibra dai is active, voice is not allowed\n"); - return -EBUSY; - } sst_cpu_ctx->active_voice_cnt++; /**FIXME in clean up patch***/ #if (defined(CONFIG_SND_MFLD_MACHINE) || (CONFIG_SND_MFLD_MACHINE_GI)) @@ -323,11 +319,6 @@ static int sst_platform_open(struct snd_pcm_substream *substream) return ret_val; } - if (sst_cpu_ctx->active_voice_cnt > 0) { - pr_err("Voice dai is active, no other stream allowed\n"); - return -EBUSY; - } - stream = kzalloc(sizeof(*stream), GFP_KERNEL); if (!stream) return -ENOMEM; |