diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2019-07-07 21:07:56 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-07-08 14:50:40 +0200 |
| commit | 213fa98981588887c1a2ed817e6a48e2428e97a1 (patch) | |
| tree | e92cf3dc0e21b240f00c4310711e40ad182986c3 /sound | |
| parent | 4ece7f6fd830d71bbb185434bf081b1f47701a67 (diff) | |
| download | lwn-213fa98981588887c1a2ed817e6a48e2428e97a1.tar.gz lwn-213fa98981588887c1a2ed817e6a48e2428e97a1.zip | |
ALSA: firewire-lib: fix different data block counter between probed event and transferred isochronous packet
For IT context, tracepoints event is probed after calculating next data
block counter. This brings difference of data block counter between
the probed event and actual isochronous packet.
This commit fixes it.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/firewire/amdtp-stream.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c index 3d410057eaa4..9259375caac4 100644 --- a/sound/firewire/amdtp-stream.c +++ b/sound/firewire/amdtp-stream.c @@ -510,13 +510,13 @@ static void build_it_pkt_header(struct amdtp_stream *s, unsigned int cycle, cip_header = NULL; } + trace_amdtp_packet(s, cycle, cip_header, payload_length, data_blocks, + index); + if (!(s->flags & CIP_DBC_IS_END_EVENT)) { s->data_block_counter = (s->data_block_counter + data_blocks) & 0xff; } - - trace_amdtp_packet(s, cycle, cip_header, payload_length, data_blocks, - index); } static int check_cip_header(struct amdtp_stream *s, const __be32 *buf, |