summaryrefslogtreecommitdiff
path: root/sound/soc/ux500/ux500_msp_dai.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/ux500/ux500_msp_dai.c')
-rw-r--r--sound/soc/ux500/ux500_msp_dai.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c
index 4558ea61f72..53f3982343b 100644
--- a/sound/soc/ux500/ux500_msp_dai.c
+++ b/sound/soc/ux500/ux500_msp_dai.c
@@ -536,10 +536,12 @@ static int ux500_msp_dai_prepare(struct snd_pcm_substream *substream,
/* If already configured -> not errors reported */
if (mode_playback) {
- if (drvdata->configured & PLAYBACK_CONFIGURED)
+ if ((drvdata->configured & PLAYBACK_CONFIGURED) &&
+ (drvdata->playback_active))
goto cleanup;
} else {
- if (drvdata->configured & CAPTURE_CONFIGURED)
+ if ((drvdata->configured & CAPTURE_CONFIGURED) &&
+ (drvdata->capture_active))
goto cleanup;
}