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

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

ALSA: fireworks: serialize transactions to update connections at bus reset 



In IEC 61883-1, at bus-reset, applications can continue isochronous
streaming by updating connections. In ALSA fireworks driver, the
operation is executed in 'update' handler for bus driver.

The connection resources are also changed in process contexts of PCM/MIDI
applications. Therefore, bus-reset handling has race condition
against connection. Current ALSA fireworks driver has a bug for the
condition.

This commit fixes the bug, by expand critical section with mutex. As a
result, connection updating operation in bus-reset handler and connection
changing operation in process context are serialized.

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

sound/firewire/fireworks/fireworks.c

+3 −0
Original line number Diff line number Diff line
@@ -301,7 +301,10 @@ static void efw_update(struct fw_unit *unit) 
	struct snd_efw *efw = dev_get_drvdata(&unit->device);



	snd_efw_transaction_bus_reset(efw->unit);



	mutex_lock(&efw->mutex);

	snd_efw_stream_update_duplex(efw);

	mutex_unlock(&efw->mutex);

}



static void efw_remove(struct fw_unit *unit)

sound/firewire/fireworks/fireworks_stream.c

+2 −4
Original line number Diff line number Diff line
@@ -313,12 +313,10 @@ void snd_efw_stream_stop_duplex(struct snd_efw *efw) 


void snd_efw_stream_update_duplex(struct snd_efw *efw)

{

	if ((cmp_connection_update(&efw->out_conn) < 0) ||

	    (cmp_connection_update(&efw->in_conn) < 0)) {

		mutex_lock(&efw->mutex);

	if (cmp_connection_update(&efw->out_conn) < 0 ||

	    cmp_connection_update(&efw->in_conn) < 0) {

		stop_stream(efw, &efw->rx_stream);

		stop_stream(efw, &efw->tx_stream);

		mutex_unlock(&efw->mutex);

	} else {

		amdtp_stream_update(&efw->rx_stream);

		amdtp_stream_update(&efw->tx_stream);