Skip to content

Commit

Permalink
Revert "ALSA: fireworks: add support for AudioFire2 quirk"
Browse files Browse the repository at this point in the history
This reverts commit 9c6893e.

The fix is superseded by the next commit as a better implementation
for supporting AudioFire2/AudioFire4/AudioFirePre8 quirks.

Signed-off-by: Takashi Sakamoto <[email protected]>
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
takaswie authored and tiwai committed Aug 5, 2015
1 parent 5d942ce commit c85523d
Showing 3 changed files with 0 additions and 6 deletions.
2 changes: 0 additions & 2 deletions sound/firewire/fireworks/fireworks.c
Original file line number Diff line number Diff line change
@@ -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;

1 change: 0 additions & 1 deletion sound/firewire/fireworks/fireworks.h
Original file line number Diff line number Diff line change
@@ -70,7 +70,6 @@ struct snd_efw {
bool resp_addr_changable;

/* for quirks */
bool is_af2;
bool is_af9;
u32 firmware_version;

3 changes: 0 additions & 3 deletions sound/firewire/fireworks/fireworks_stream.c
Original file line number Diff line number Diff line change
@@ -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;

0 comments on commit c85523d

Please sign in to comment.