diff options
| author | Erik Gilling <konkers@android.com> | 2010-11-03 13:52:36 -0700 |
|---|---|---|
| committer | Erik Gilling <konkers@android.com> | 2010-11-03 13:52:58 -0700 |
| commit | dc00fd520bb1059e8a351599d4379ee5f1a0eca3 (patch) | |
| tree | b607c0198b68bd7cffbfb7f792775135e133c98d /arch/arm/mach-tegra/tegra_spdif_audio.c | |
| parent | 61ac344745d3ab8d143906fb774c529c9301e574 (diff) | |
| parent | e8d9abdf7b8878740e73a13ba084c39a24967da2 (diff) | |
Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
Change-Id: Id52bf11ad517d9ebf5b68db4db15c006b82d75f9
Diffstat (limited to 'arch/arm/mach-tegra/tegra_spdif_audio.c')
| -rw-r--r-- | arch/arm/mach-tegra/tegra_spdif_audio.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/tegra_spdif_audio.c b/arch/arm/mach-tegra/tegra_spdif_audio.c index 9f719e392deb..bd99440a0188 100644 --- a/arch/arm/mach-tegra/tegra_spdif_audio.c +++ b/arch/arm/mach-tegra/tegra_spdif_audio.c @@ -483,7 +483,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; |