summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-11-26 18:37:40 +0100
committerTakashi Iwai <tiwai@suse.de>2013-11-26 18:37:40 +0100
commit049da9e8f8fe9b08b934df4ffe240d14a9788e19 (patch)
treea1285d25d4d37facae501d0e45a35ca7013c927a
parentALSA: hda - Drop bus->avoid_link_reset flag (diff)
parentALSA: firewire-lib: fix wrong value for FDF field as an empty packet (diff)
downloadlinux-049da9e8f8fe9b08b934df4ffe240d14a9788e19.tar.xz
linux-049da9e8f8fe9b08b934df4ffe240d14a9788e19.zip
Merge branch 'fix/firewire' into for-linus
-rw-r--r--sound/firewire/amdtp.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/sound/firewire/amdtp.c b/sound/firewire/amdtp.c
index d3226892ad6b..9048777228e2 100644
--- a/sound/firewire/amdtp.c
+++ b/sound/firewire/amdtp.c
@@ -434,17 +434,14 @@ static void queue_out_packet(struct amdtp_out_stream *s, unsigned int cycle)
return;
index = s->packet_index;
+ /* this module generate empty packet for 'no data' */
syt = calculate_syt(s, cycle);
- if (!(s->flags & CIP_BLOCKING)) {
+ if (!(s->flags & CIP_BLOCKING))
data_blocks = calculate_data_blocks(s);
- } else {
- if (syt != 0xffff) {
- data_blocks = s->syt_interval;
- } else {
- data_blocks = 0;
- syt = 0xffffff;
- }
- }
+ else if (syt != 0xffff)
+ data_blocks = s->syt_interval;
+ else
+ data_blocks = 0;
buffer = s->buffer.packets[index].buffer;
buffer[0] = cpu_to_be32(ACCESS_ONCE(s->source_node_id_field) |