1 files changed, 10 insertions, 2 deletions

diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 9732edf77f86..91bc8f18791e 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -2234,6 +2234,9 @@ static int parse_audio_unit(struct mixer_build *state, int unitid)
 
 static void snd_usb_mixer_free(struct usb_mixer_interface *mixer)
 {
+        /* kill pending URBs */
+        snd_usb_mixer_disconnect(mixer);
+
         kfree(mixer->id_elems);
         if (mixer->urb) {
                 kfree(mixer->urb->transfer_buffer);
@@ -2584,8 +2587,13 @@ _error:
 
 void snd_usb_mixer_disconnect(struct usb_mixer_interface *mixer)
 {
-        usb_kill_urb(mixer->urb);
-        usb_kill_urb(mixer->rc_urb);
+        if (mixer->disconnected)
+                return;
+        if (mixer->urb)
+                usb_kill_urb(mixer->urb);
+        if (mixer->rc_urb)
+                usb_kill_urb(mixer->rc_urb);
+        mixer->disconnected = true;
 }
 
 #ifdef CONFIG_PM