mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
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: Takashi Sakamoto <o-takashi@sakamocchi.jp> Cc: <stable@vger.kernel.org> # 3.19+ Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
d23c2cc448
commit
dec84316dd
6 changed files with 15 additions and 28 deletions
|
@ -127,8 +127,11 @@ bebob_card_free(struct snd_card *card)
|
||||||
{
|
{
|
||||||
struct snd_bebob *bebob = card->private_data;
|
struct snd_bebob *bebob = card->private_data;
|
||||||
|
|
||||||
|
snd_bebob_stream_destroy_duplex(bebob);
|
||||||
fw_unit_put(bebob->unit);
|
fw_unit_put(bebob->unit);
|
||||||
|
|
||||||
|
kfree(bebob->maudio_special_quirk);
|
||||||
|
|
||||||
if (bebob->card_index >= 0) {
|
if (bebob->card_index >= 0) {
|
||||||
mutex_lock(&devices_mutex);
|
mutex_lock(&devices_mutex);
|
||||||
clear_bit(bebob->card_index, devices_used);
|
clear_bit(bebob->card_index, devices_used);
|
||||||
|
@ -314,10 +317,9 @@ static void bebob_remove(struct fw_unit *unit)
|
||||||
if (bebob == NULL)
|
if (bebob == NULL)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
kfree(bebob->maudio_special_quirk);
|
/* Awake bus-reset waiters. */
|
||||||
|
if (!completion_done(&bebob->bus_reset))
|
||||||
snd_bebob_stream_destroy_duplex(bebob);
|
complete_all(&bebob->bus_reset);
|
||||||
snd_card_disconnect(bebob->card);
|
|
||||||
|
|
||||||
/* No need to wait for releasing card object in this context. */
|
/* No need to wait for releasing card object in this context. */
|
||||||
snd_card_free_when_closed(bebob->card);
|
snd_card_free_when_closed(bebob->card);
|
||||||
|
|
|
@ -716,14 +716,10 @@ void snd_bebob_stream_update_duplex(struct snd_bebob *bebob)
|
||||||
*/
|
*/
|
||||||
void snd_bebob_stream_destroy_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->rx_stream);
|
||||||
amdtp_stream_destroy(&bebob->tx_stream);
|
amdtp_stream_destroy(&bebob->tx_stream);
|
||||||
|
|
||||||
destroy_both_connections(bebob);
|
destroy_both_connections(bebob);
|
||||||
|
|
||||||
mutex_unlock(&bebob->mutex);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -236,6 +236,7 @@ static void dice_card_free(struct snd_card *card)
|
||||||
{
|
{
|
||||||
struct snd_dice *dice = card->private_data;
|
struct snd_dice *dice = card->private_data;
|
||||||
|
|
||||||
|
snd_dice_stream_destroy_duplex(dice);
|
||||||
snd_dice_transaction_destroy(dice);
|
snd_dice_transaction_destroy(dice);
|
||||||
fw_unit_put(dice->unit);
|
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);
|
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. */
|
/* No need to wait for releasing card object in this context. */
|
||||||
snd_card_free_when_closed(dice->card);
|
snd_card_free_when_closed(dice->card);
|
||||||
}
|
}
|
||||||
|
|
|
@ -184,8 +184,12 @@ efw_card_free(struct snd_card *card)
|
||||||
{
|
{
|
||||||
struct snd_efw *efw = card->private_data;
|
struct snd_efw *efw = card->private_data;
|
||||||
|
|
||||||
|
snd_efw_stream_destroy_duplex(efw);
|
||||||
|
snd_efw_transaction_remove_instance(efw);
|
||||||
fw_unit_put(efw->unit);
|
fw_unit_put(efw->unit);
|
||||||
|
|
||||||
|
kfree(efw->resp_buf);
|
||||||
|
|
||||||
if (efw->card_index >= 0) {
|
if (efw->card_index >= 0) {
|
||||||
mutex_lock(&devices_mutex);
|
mutex_lock(&devices_mutex);
|
||||||
clear_bit(efw->card_index, devices_used);
|
clear_bit(efw->card_index, devices_used);
|
||||||
|
@ -193,7 +197,6 @@ efw_card_free(struct snd_card *card)
|
||||||
}
|
}
|
||||||
|
|
||||||
mutex_destroy(&efw->mutex);
|
mutex_destroy(&efw->mutex);
|
||||||
kfree(efw->resp_buf);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
@ -297,11 +300,6 @@ static void efw_remove(struct fw_unit *unit)
|
||||||
{
|
{
|
||||||
struct snd_efw *efw = dev_get_drvdata(&unit->device);
|
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. */
|
/* No need to wait for releasing card object in this context. */
|
||||||
snd_card_free_when_closed(efw->card);
|
snd_card_free_when_closed(efw->card);
|
||||||
}
|
}
|
||||||
|
|
|
@ -324,12 +324,8 @@ void snd_efw_stream_update_duplex(struct snd_efw *efw)
|
||||||
|
|
||||||
void snd_efw_stream_destroy_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->rx_stream);
|
||||||
destroy_stream(efw, &efw->tx_stream);
|
destroy_stream(efw, &efw->tx_stream);
|
||||||
|
|
||||||
mutex_unlock(&efw->mutex);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void snd_efw_stream_lock_changed(struct snd_efw *efw)
|
void snd_efw_stream_lock_changed(struct snd_efw *efw)
|
||||||
|
|
|
@ -115,6 +115,10 @@ static void oxfw_card_free(struct snd_card *card)
|
||||||
struct snd_oxfw *oxfw = card->private_data;
|
struct snd_oxfw *oxfw = card->private_data;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
||||||
|
snd_oxfw_stream_destroy_simplex(oxfw, &oxfw->rx_stream);
|
||||||
|
if (oxfw->has_output)
|
||||||
|
snd_oxfw_stream_destroy_simplex(oxfw, &oxfw->tx_stream);
|
||||||
|
|
||||||
fw_unit_put(oxfw->unit);
|
fw_unit_put(oxfw->unit);
|
||||||
|
|
||||||
for (i = 0; i < SND_OXFW_STREAM_FORMAT_ENTRIES; i++) {
|
for (i = 0; i < SND_OXFW_STREAM_FORMAT_ENTRIES; i++) {
|
||||||
|
@ -220,12 +224,6 @@ static void oxfw_remove(struct fw_unit *unit)
|
||||||
{
|
{
|
||||||
struct snd_oxfw *oxfw = dev_get_drvdata(&unit->device);
|
struct snd_oxfw *oxfw = dev_get_drvdata(&unit->device);
|
||||||
|
|
||||||
snd_card_disconnect(oxfw->card);
|
|
||||||
|
|
||||||
snd_oxfw_stream_destroy_simplex(oxfw, &oxfw->rx_stream);
|
|
||||||
if (oxfw->has_output)
|
|
||||||
snd_oxfw_stream_destroy_simplex(oxfw, &oxfw->tx_stream);
|
|
||||||
|
|
||||||
/* No need to wait for releasing card object in this context. */
|
/* No need to wait for releasing card object in this context. */
|
||||||
snd_card_free_when_closed(oxfw->card);
|
snd_card_free_when_closed(oxfw->card);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue