diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2015-08-05 09:21:04 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-08-05 07:51:53 +0200 |
| commit | c85523d1d97cc86aadc388221aa83ae9bc1e7cca (patch) | |
| tree | ea51a34b8f92b9197e52aff6628cf26e356205ca /sound | |
| parent | 5d942ce63c8fd98794a8ba9af559925c8432a052 (diff) | |
| download | op-kernel-dev-c85523d1d97cc86aadc388221aa83ae9bc1e7cca.zip op-kernel-dev-c85523d1d97cc86aadc388221aa83ae9bc1e7cca.tar.gz | |
Revert "ALSA: fireworks: add support for AudioFire2 quirk"
This reverts commit 9c6893e0be38b6ca9a56a854226e51dee0a16a5a.
The fix is superseded by the next commit as a better implementation
for supporting AudioFire2/AudioFire4/AudioFirePre8 quirks.
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/fireworks/fireworks.c | 2 | ||||
| -rw-r--r-- | sound/firewire/fireworks/fireworks.h | 1 | ||||
| -rw-r--r-- | sound/firewire/fireworks/fireworks_stream.c | 3 |
3 files changed, 0 insertions, 6 deletions
diff --git a/sound/firewire/fireworks/fireworks.c b/sound/firewire/fireworks/fireworks.c index c670db4..2682e7e 100644 --- a/sound/firewire/fireworks/fireworks.c +++ b/sound/firewire/fireworks/fireworks.c @@ -248,8 +248,6 @@ efw_probe(struct fw_unit *unit, err = get_hardware_info(efw); if (err < 0) goto error; - if (entry->model_id == MODEL_ECHO_AUDIOFIRE_2) - efw->is_af2 = true; if (entry->model_id == MODEL_ECHO_AUDIOFIRE_9) efw->is_af9 = true; diff --git a/sound/firewire/fireworks/fireworks.h b/sound/firewire/fireworks/fireworks.h index c33252b..4f0201a 100644 --- a/sound/firewire/fireworks/fireworks.h +++ b/sound/firewire/fireworks/fireworks.h @@ -70,7 +70,6 @@ struct snd_efw { bool resp_addr_changable; /* for quirks */ - bool is_af2; bool is_af9; u32 firmware_version; diff --git a/sound/firewire/fireworks/fireworks_stream.c b/sound/firewire/fireworks/fireworks_stream.c index a0762dd..c55db1b 100644 --- a/sound/firewire/fireworks/fireworks_stream.c +++ b/sound/firewire/fireworks/fireworks_stream.c @@ -172,9 +172,6 @@ int snd_efw_stream_init_duplex(struct snd_efw *efw) efw->tx_stream.flags |= CIP_DBC_IS_END_EVENT; /* Fireworks reset dbc at bus reset. */ efw->tx_stream.flags |= CIP_SKIP_DBC_ZERO_CHECK; - /* AudioFire2 starts packets with non-zero dbc. */ - if (efw->is_af2) - efw->tx_stream.flags |= CIP_SKIP_INIT_DBC_CHECK; /* AudioFire9 always reports wrong dbs. */ if (efw->is_af9) efw->tx_stream.flags |= CIP_WRONG_DBS; |
