summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2015-12-31 13:58:14 +0900
committerTakashi Iwai <tiwai@suse.de>2016-01-06 10:18:54 +0100
commit2eb65d67afbf9364b525b657f1475d1a2cbc27de (patch)
tree306bd6942c5d4ac1d83dd390942c6a54c955ce7d
parenta2875a92b8413b4d7eacf96802c9718aeeb0363f (diff)
downloadlinux-stable-2eb65d67afbf9364b525b657f1475d1a2cbc27de.tar.gz
linux-stable-2eb65d67afbf9364b525b657f1475d1a2cbc27de.tar.bz2
linux-stable-2eb65d67afbf9364b525b657f1475d1a2cbc27de.zip
ALSA: dice: expand timeout to wait for Dice notification
Some users have reported that their Dice based models generate ETIMEDOUT when starting PCM playback. It means that current timeout (=100msec) is not enough for their models to transfer notifications. This commit expands the timeout up to 2 sec. As a result, in a worst case, any operations to start AMDTP streams takes 2 sec or more. Then, in userspace, snd_pcm_hw_params(), snd_pcm_prepare(), snd_pcm_recover(), snd_rawmidi_open(), snd_seq_connect_from() and snd_seq_connect_to() may take the time. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/firewire/dice/dice-transaction.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/firewire/dice/dice-transaction.c b/sound/firewire/dice/dice-transaction.c
index 55c1fbf31626..a4ff4e0bc0af 100644
--- a/sound/firewire/dice/dice-transaction.c
+++ b/sound/firewire/dice/dice-transaction.c
@@ -9,7 +9,7 @@
#include "dice.h"
-#define NOTIFICATION_TIMEOUT_MS 100
+#define NOTIFICATION_TIMEOUT_MS (2 * MSEC_PER_SEC)
static u64 get_subaddr(struct snd_dice *dice, enum snd_dice_addr_type type,
u64 offset)