diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2019-05-22 23:17:03 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-05-23 12:19:38 +0200 |
| commit | 07ea238ca139aef1820802409a6a7bdd45e38caa (patch) | |
| tree | f808ba419c908f0e9969e945ea69a189d86caf9b | |
| parent | ALSA: firewire-lib: use IT context header to compute cycle count for scheduli... (diff) | |
| download | linux-07ea238ca139aef1820802409a6a7bdd45e38caa.tar.gz linux-07ea238ca139aef1820802409a6a7bdd45e38caa.zip | |
ALSA: firewire-lib: use clear name for variable of CIP header
This commit is to distinguish variable of CIP header from variable of
isochronous context header.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/firewire/amdtp-stream.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c index f43943fd962d..020edf2b1726 100644 --- a/sound/firewire/amdtp-stream.c +++ b/sound/firewire/amdtp-stream.c @@ -286,15 +286,15 @@ EXPORT_SYMBOL(amdtp_stream_set_parameters); unsigned int amdtp_stream_get_max_payload(struct amdtp_stream *s) { unsigned int multiplier = 1; - unsigned int header_size = 0; + unsigned int cip_header_size = 0; if (s->flags & CIP_JUMBO_PAYLOAD) multiplier = 5; if (!(s->flags & CIP_NO_HEADER)) - header_size = 8; + cip_header_size = sizeof(__be32) * 2; - return header_size + - s->syt_interval * s->data_block_quadlets * 4 * multiplier; + return cip_header_size + + s->syt_interval * s->data_block_quadlets * sizeof(__be32) * multiplier; } EXPORT_SYMBOL(amdtp_stream_get_max_payload); |