Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c85523d1 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

Revert "ALSA: fireworks: add support for AudioFire2 quirk" 



This reverts commit 9c6893e0.

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

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 5d942ce6

sound/firewire/fireworks/fireworks.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -248,8 +248,6 @@ efw_probe(struct fw_unit *unit, 
	err = get_hardware_info(efw);

	err = get_hardware_info(efw);

	if (err < 0)

	if (err < 0)

		goto error;

		goto error;

	if (entry->model_id == MODEL_ECHO_AUDIOFIRE_2)

		efw->is_af2 = true;

	if (entry->model_id == MODEL_ECHO_AUDIOFIRE_9)

	if (entry->model_id == MODEL_ECHO_AUDIOFIRE_9)

		efw->is_af9 = true;

		efw->is_af9 = true;

sound/firewire/fireworks/fireworks.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -70,7 +70,6 @@ struct snd_efw { 
	bool resp_addr_changable;

	bool resp_addr_changable;





	/* for quirks */

	/* for quirks */

	bool is_af2;

	bool is_af9;

	bool is_af9;

	u32 firmware_version;

	u32 firmware_version;

sound/firewire/fireworks/fireworks_stream.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -172,9 +172,6 @@ int snd_efw_stream_init_duplex(struct snd_efw *efw) 
	efw->tx_stream.flags |= CIP_DBC_IS_END_EVENT;

	efw->tx_stream.flags |= CIP_DBC_IS_END_EVENT;

	/* Fireworks reset dbc at bus reset. */

	/* Fireworks reset dbc at bus reset. */

	efw->tx_stream.flags |= CIP_SKIP_DBC_ZERO_CHECK;

	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. */

	/* AudioFire9 always reports wrong dbs. */

	if (efw->is_af9)

	if (efw->is_af9)

		efw->tx_stream.flags |= CIP_WRONG_DBS;

		efw->tx_stream.flags |= CIP_WRONG_DBS;