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

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

ALSA: fireworks/bebob/dice/oxfw: make it possible to shutdown safely 



A part of these drivers, especially BeBoB driver, are programmed to wait
some events. Thus the drivers should not destroy any data in .remove()
context.

This commit moves some destructors from 'struct fw_driver.remove()' to
'struct snd_card.private_free()' to shutdown safely.

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Cc: <stable@vger.kernel.org> # 3.19+
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d23c2cc4

sound/firewire/bebob/bebob.c

+6 −4
Original line number Diff line number Diff line
@@ -127,8 +127,11 @@ bebob_card_free(struct snd_card *card) 
{

	struct snd_bebob *bebob = card->private_data;



	snd_bebob_stream_destroy_duplex(bebob);

	fw_unit_put(bebob->unit);



	kfree(bebob->maudio_special_quirk);



	if (bebob->card_index >= 0) {

		mutex_lock(&devices_mutex);

		clear_bit(bebob->card_index, devices_used);
@@ -314,10 +317,9 @@ static void bebob_remove(struct fw_unit *unit) 
	if (bebob == NULL)

		return;



	kfree(bebob->maudio_special_quirk);



	snd_bebob_stream_destroy_duplex(bebob);

	snd_card_disconnect(bebob->card);

	/* Awake bus-reset waiters. */

	if (!completion_done(&bebob->bus_reset))

		complete_all(&bebob->bus_reset);



	/* No need to wait for releasing card object in this context. */

	snd_card_free_when_closed(bebob->card);

sound/firewire/bebob/bebob_stream.c

+0 −4
Original line number Diff line number Diff line
@@ -716,14 +716,10 @@ void snd_bebob_stream_update_duplex(struct snd_bebob *bebob) 
 */

void snd_bebob_stream_destroy_duplex(struct snd_bebob *bebob)

{

	mutex_lock(&bebob->mutex);



	amdtp_stream_destroy(&bebob->rx_stream);

	amdtp_stream_destroy(&bebob->tx_stream);



	destroy_both_connections(bebob);



	mutex_unlock(&bebob->mutex);

}



/*

sound/firewire/dice/dice.c

+1 −4
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ static void dice_card_free(struct snd_card *card) 
{

	struct snd_dice *dice = card->private_data;



	snd_dice_stream_destroy_duplex(dice);

	snd_dice_transaction_destroy(dice);

	fw_unit_put(dice->unit);
@@ -313,10 +314,6 @@ static void dice_remove(struct fw_unit *unit) 
{

	struct snd_dice *dice = dev_get_drvdata(&unit->device);



	snd_card_disconnect(dice->card);



	snd_dice_stream_destroy_duplex(dice);



	/* No need to wait for releasing card object in this context. */

	snd_card_free_when_closed(dice->card);

}

sound/firewire/fireworks/fireworks.c

+4 −6
Original line number Diff line number Diff line
@@ -184,8 +184,12 @@ efw_card_free(struct snd_card *card) 
{

	struct snd_efw *efw = card->private_data;



	snd_efw_stream_destroy_duplex(efw);

	snd_efw_transaction_remove_instance(efw);

	fw_unit_put(efw->unit);



	kfree(efw->resp_buf);



	if (efw->card_index >= 0) {

		mutex_lock(&devices_mutex);

		clear_bit(efw->card_index, devices_used);
@@ -193,7 +197,6 @@ efw_card_free(struct snd_card *card) 
	}



	mutex_destroy(&efw->mutex);

	kfree(efw->resp_buf);

}



static int
@@ -297,11 +300,6 @@ static void efw_remove(struct fw_unit *unit) 
{

	struct snd_efw *efw = dev_get_drvdata(&unit->device);



	snd_efw_stream_destroy_duplex(efw);

	snd_efw_transaction_remove_instance(efw);



	snd_card_disconnect(efw->card);



	/* No need to wait for releasing card object in this context. */

	snd_card_free_when_closed(efw->card);

}

sound/firewire/fireworks/fireworks_stream.c

+0 −4
Original line number Diff line number Diff line
@@ -324,12 +324,8 @@ void snd_efw_stream_update_duplex(struct snd_efw *efw) 


void snd_efw_stream_destroy_duplex(struct snd_efw *efw)

{

	mutex_lock(&efw->mutex);



	destroy_stream(efw, &efw->rx_stream);

	destroy_stream(efw, &efw->tx_stream);



	mutex_unlock(&efw->mutex);

}



void snd_efw_stream_lock_changed(struct snd_efw *efw)