diff options
| author |   Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2021-06-11 12:50:02 +0900 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2021-06-11 10:30:04 +0200 |
| commit | 82fb3bf92c0fb6cd471295ba9c774a47c7d64c8c (patch) | |
| tree | b87e4d54ef2eb3acf6fdece6a34e680762493000 /sound/firewire/bebob | |
| parent | ALSA: bebob: dismiss sleep after breaking connections (diff) | |
| download | linux-dev-82fb3bf92c0fb6cd471295ba9c774a47c7d64c8c.tar.xz linux-dev-82fb3bf92c0fb6cd471295ba9c774a47c7d64c8c.zip | |
ALSA: bebob: delete workaround for protocol version 3
In a commit c4d860a0d256 ("ALSA: bebob: loosen up severity of checking
continuity for BeBoB v3 quirk"), a workaround was added for the quirk in
BeBoB protocol version 3 against the discontinuity of data block counter.
As long as seeing with sequence replay for media clock recovery, such
quirk disappears.
This commit deletes the workaround.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20210611035003.26852-3-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/bebob')
| -rw-r--r-- | sound/firewire/bebob/bebob.c | 7 | ||||
| -rw-r--r-- | sound/firewire/bebob/bebob.h | 2 | ||||
| -rw-r--r-- | sound/firewire/bebob/bebob_stream.c | 8 |
3 files changed, 0 insertions, 17 deletions
diff --git a/sound/firewire/bebob/bebob.c b/sound/firewire/bebob/bebob.c index e7dd112c31c5..25222cc27e43 100644 --- a/sound/firewire/bebob/bebob.c +++ b/sound/firewire/bebob/bebob.c @@ -75,7 +75,6 @@ name_device(struct snd_bebob *bebob) u32 hw_id; u32 data[2] = {0}; u32 revision; - u32 version; int err; /* get vendor name from root directory */ @@ -108,12 +107,6 @@ name_device(struct snd_bebob *bebob) if (err < 0) goto end; - err = snd_bebob_read_quad(bebob->unit, INFO_OFFSET_BEBOB_VERSION, - &version); - if (err < 0) - goto end; - bebob->version = version; - strcpy(bebob->card->driver, "BeBoB"); strcpy(bebob->card->shortname, model); strcpy(bebob->card->mixername, model); diff --git a/sound/firewire/bebob/bebob.h b/sound/firewire/bebob/bebob.h index edd93699ce1a..fc2b9b36159c 100644 --- a/sound/firewire/bebob/bebob.h +++ b/sound/firewire/bebob/bebob.h @@ -109,8 +109,6 @@ struct snd_bebob { /* for M-Audio special devices */ void *maudio_special_quirk; - /* For BeBoB version quirk. */ - unsigned int version; bool discontinuity_quirk; struct amdtp_domain domain; diff --git a/sound/firewire/bebob/bebob_stream.c b/sound/firewire/bebob/bebob_stream.c index 6d47c25654e6..02972b32e170 100644 --- a/sound/firewire/bebob/bebob_stream.c +++ b/sound/firewire/bebob/bebob_stream.c @@ -456,14 +456,6 @@ static int init_stream(struct snd_bebob *bebob, struct amdtp_stream *stream) } if (stream == &bebob->tx_stream) { - // BeBoB v3 transfers packets with these qurks: - // - In the beginning of streaming, the value of dbc is - // incremented even if no data blocks are transferred. - // - The value of dbc is reset suddenly. - if (bebob->version > 2) - bebob->tx_stream.flags |= CIP_EMPTY_HAS_WRONG_DBC | - CIP_SKIP_DBC_ZERO_CHECK; - // At high sampling rate, M-Audio special firmware transmits // empty packet with the value of dbc incremented by 8 but the // others are valid to IEC 61883-1. |