projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'asoc/topic/max98926', 'asoc/topic/mtk', 'asoc/topic...
[linux-2.6-block.git]
/
sound
/
soc
/
mxs
/
mxs-saif.c
diff --git
a/sound/soc/mxs/mxs-saif.c
b/sound/soc/mxs/mxs-saif.c
index a6c7b8d87cd2f15198334840b9013980f87313c0..13631003cb7c6796d49f5278834eb5924aea294c 100644
(file)
--- a/
sound/soc/mxs/mxs-saif.c
+++ b/
sound/soc/mxs/mxs-saif.c
@@
-418,7
+418,7
@@
static int mxs_saif_hw_params(struct snd_pcm_substream *substream,
}
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");
return -EBUSY;
}