leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: firewire-lib: code refactoring for error path of parser for CIP header

Browse Source 
When a parser for CIP header returns -EAGAIN, no extra care is needed
to probe tracepoints event.

This commit adds code refactoring for the error path.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto 2019-07-07 21:07:57 +09:00 committed by Takashi Iwai
parent 213fa98981
commit b8b0e24c22
1 changed files with 2 additions and 9 deletions

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

@ -635,12 +635,8 @@ static int parse_ir_ctx_header(struct amdtp_stream *s, unsigned int cycle,
cip_header = ctx_header + 2; cip_header = ctx_header + 2;
err = check_cip_header(s, cip_header, *payload_length, err = check_cip_header(s, cip_header, *payload_length,
data_blocks, dbc, syt); data_blocks, dbc, syt);
if (err < 0) { if (err < 0)
if (err != -EAGAIN) return err;
return err;
*data_blocks = 0;
}
} else { } else {
cip_header = NULL; cip_header = NULL;
err = 0; err = 0;
@ -654,9 +650,6 @@ static int parse_ir_ctx_header(struct amdtp_stream *s, unsigned int cycle,
*dbc = 0; *dbc = 0;
} }
if (err < 0)
return err;
s->data_block_counter = *dbc; s->data_block_counter = *dbc;
trace_amdtp_packet(s, cycle, cip_header, *payload_length, *data_blocks, trace_amdtp_packet(s, cycle, cip_header, *payload_length, *data_blocks,