summaryrefslogtreecommitdiffstats
path: root/sound/firewire
diff options
context:
space:
mode:
authorTakashi Sakamoto2015-05-22 16:00:54 +0200
committerTakashi Iwai2015-05-23 09:13:21 +0200
commit727d3a0b1f97404eb1c3c136ba7fd41ab7ea6a22 (patch)
tree21e82b4dc4f6c8af3867b127a74fe9f4d3651dd9 /sound/firewire
parentALSA: firewire-lib: set streaming error outside of packetization (diff)
downloadkernel-qcow2-linux-727d3a0b1f97404eb1c3c136ba7fd41ab7ea6a22.tar.gz
kernel-qcow2-linux-727d3a0b1f97404eb1c3c136ba7fd41ab7ea6a22.tar.xz
kernel-qcow2-linux-727d3a0b1f97404eb1c3c136ba7fd41ab7ea6a22.zip
ALSA: firewire-lib: remove restriction for non-blocking mode
Former patches allow non-blocking streams to synchronize with timestamp. This patch removes the restriction. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
-rw-r--r--sound/firewire/amdtp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/firewire/amdtp.c b/sound/firewire/amdtp.c
index c26dda7f41e6..97afc887a53d 100644
--- a/sound/firewire/amdtp.c
+++ b/sound/firewire/amdtp.c
@@ -909,7 +909,7 @@ static void amdtp_stream_first_callback(struct fw_iso_context *context,
if (s->direction == AMDTP_IN_STREAM)
context->callback.sc = in_stream_callback;
- else if ((s->flags & CIP_BLOCKING) && (s->flags & CIP_SYNC_TO_DEVICE))
+ else if (s->flags & CIP_SYNC_TO_DEVICE)
context->callback.sc = slave_stream_callback;
else
context->callback.sc = out_stream_callback;