redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ALSA: firewire-lib/fireface: fix initial value of data block counter for IR context with CIP_NO_HEADER 

For IR context, ALSA IEC 61883-1/6 engine uses initial value of data
block counter as UINT_MAX, to detect first isochronous packet in the
middle of packet streaming.

At present, when CIP_NO_HEADER is used (i.e. for ALSA fireface driver),
the initial value is used for tracepoints event. 0x00 should be
for the event when the initial value is UINT_MAX because isochronous
packets with CIP_NO_HEADER option has no field for data block count.

This commit fixes the bug.

Fixes: 76864868db ("ALSA: firewire-lib: cache next data_block_counter after probing tracepoints event for IR context")
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
alistair/sunxi64-5.4-dsi
Takashi Sakamoto 2019-07-07 21:07:54 +09:00 committed by Takashi Iwai
parent 0ebf3ceb83
commit 7fbf909668
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/firewire/amdtp-stream.c
View File

@ -646,8 +646,12 @@ static int parse_ir_ctx_header(struct amdtp_stream *s, unsigned int cycle,
err = 0;
*data_blocks = *payload_length / sizeof(__be32) /
s->data_block_quadlets;
*dbc = s->data_block_counter;
*syt = 0;
if (s->data_block_counter != UINT_MAX)
*dbc = s->data_block_counter;
else
*dbc = 0;
}
if (err >= 0 && s->flags & CIP_DBC_IS_END_EVENT)