[ARM] tegra_i2s_audio: add timeout to prevent flush deadlock

Signed-off-by: Iliyan Malchev <malchev@google.com>

diff --git a/arch/arm/mach-tegra/tegra_spdif_audio.c b/arch/arm/mach-tegra/tegra_spdif_audio.c
index 9c6ae5b6f41ae22679bc43bf3d0e593090f2809e..3764edfdf86935d5f90a765cf21b5125bbf90644 100644 (file)
--- a/arch/arm/mach-tegra/tegra_spdif_audio.c
+++ b/arch/arm/mach-tegra/tegra_spdif_audio.c
@@ -478,7 +478,10 @@ static bool wait_till_stopped(struct audio_stream *as)
 {
        int rc;
        pr_debug("%s: wait for completion\n", __func__);
-       rc = wait_for_completion_interruptible(&as->stop_completion);
+       rc = wait_for_completion_interruptible_timeout(
+                       &as->stop_completion, HZ);
+       if (!rc)
+               pr_err("%s: wait timed out\n", __func__);
        allow_suspend(as);
        pr_debug("%s: done: %d\n", __func__, rc);
        return true;