mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
ASoC: mxs-saif: check BUSY bit in hw_params() only if not mclk_in_use
If something else, typically a codec, has enabled mclk, the BUSY bit may be set when hw_params() is called without this being an error. This check thus causes intermittent failures to configure the sound device when used in such a manner. Fix this by making the test conditional on !saif->mclk_in_use. Signed-off-by: Mans Rullgard <mans@mansr.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
92e963f50f
commit
436e056c4b
1 changed files with 1 additions and 1 deletions
|
@ -408,7 +408,7 @@ static int mxs_saif_hw_params(struct snd_pcm_substream *substream,
|
||||||
}
|
}
|
||||||
|
|
||||||
stat = __raw_readl(saif->base + SAIF_STAT);
|
stat = __raw_readl(saif->base + SAIF_STAT);
|
||||||
if (stat & BM_SAIF_STAT_BUSY) {
|
if (!saif->mclk_in_use && (stat & BM_SAIF_STAT_BUSY)) {
|
||||||
dev_err(cpu_dai->dev, "error: busy\n");
|
dev_err(cpu_dai->dev, "error: busy\n");
|
||||||
return -EBUSY;
|
return -EBUSY;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue