aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sound/firewire/dice.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/firewire/dice.c b/sound/firewire/dice.c
index 63446f86cdd..d0575a96ea7 100644
--- a/sound/firewire/dice.c
+++ b/sound/firewire/dice.c
@@ -1000,12 +1000,15 @@ static void dice_remove(struct fw_unit *unit)
{
struct dice *dice = dev_get_drvdata(&unit->device);
- snd_card_disconnect(dice->card);
-
mutex_lock(&dice->mutex);
+
amdtp_out_stream_pcm_abort(&dice->stream);
+
+ snd_card_disconnect(dice->card);
+
dice_stream_stop(dice);
dice_owner_clear(dice);
+
mutex_unlock(&dice->mutex);
snd_card_free_when_closed(dice->card);