summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2012-01-05 22:16:24 +0100
committerClemens Ladisch <clemens@ladisch.de>2013-10-20 22:07:57 +0200
commit640d9b421d4d8c7593aa8647479a4c7c6fe0ca65 (patch)
treee6a27c094a681aabcdcd726a513b5ae6568658b2
parent4edeb831f32d17fba056eb752f7afc26a19674a0 (diff)
downloadlinux-640d9b421d4d8c7593aa8647479a4c7c6fe0ca65.tar.bz2
ALSA: dice: check clock change timeout
Output a warning if the wait for the clock change notification times out. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
-rw-r--r--sound/firewire/dice.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/firewire/dice.c b/sound/firewire/dice.c
index 61dd00c4fae3..3395c8ba7af1 100644
--- a/sound/firewire/dice.c
+++ b/sound/firewire/dice.c
@@ -551,8 +551,9 @@ static int dice_change_rate(struct dice *dice, unsigned int clock_rate)
if (err < 0)
return err;
- wait_for_completion_timeout(&dice->clock_accepted,
- msecs_to_jiffies(100));
+ if (!wait_for_completion_timeout(&dice->clock_accepted,
+ msecs_to_jiffies(100)))
+ dev_warn(&dice->unit->device, "clock change timed out\n");
return 0;
}