1 files changed, 6 insertions, 4 deletions

diff --git a/sound/firewire/bebob/bebob.c b/sound/firewire/bebob/bebob.c
index b612599fb543..611b7dae7ee5 100644
--- a/sound/firewire/bebob/bebob.c
+++ b/sound/firewire/bebob/bebob.c
@@ -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);