diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2019-07-07 21:07:57 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-07-08 14:50:40 +0200 |
| commit | b8b0e24c226e4434821f437070935218fdd39741 (patch) | |
| tree | c3bca4885e6663c4913d0cdb3bce9b5717deb4fb /sound | |
| parent | 213fa98981588887c1a2ed817e6a48e2428e97a1 (diff) | |
| download | linux-b8b0e24c226e4434821f437070935218fdd39741.tar.gz linux-b8b0e24c226e4434821f437070935218fdd39741.tar.bz2 linux-b8b0e24c226e4434821f437070935218fdd39741.zip | |
ALSA: firewire-lib: code refactoring for error path of parser for CIP header
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/firewire/amdtp-stream.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c index 9259375caac4..0b9e643187e2 100644 --- a/sound/firewire/amdtp-stream.c +++ b/sound/firewire/amdtp-stream.c @@ -635,12 +635,8 @@ static int parse_ir_ctx_header(struct amdtp_stream *s, unsigned int cycle, cip_header = ctx_header + 2; err = check_cip_header(s, cip_header, *payload_length, data_blocks, dbc, syt); - if (err < 0) { - if (err != -EAGAIN) - return err; - - *data_blocks = 0; - } + if (err < 0) + return err; } else { cip_header = NULL; err = 0; @@ -654,9 +650,6 @@ static int parse_ir_ctx_header(struct amdtp_stream *s, unsigned int cycle, *dbc = 0; } - if (err < 0) - return err; - s->data_block_counter = *dbc; trace_amdtp_packet(s, cycle, cip_header, *payload_length, *data_blocks, |