3 files changed, 39 insertions, 0 deletions

diff --git a/sound/usb/card.c b/sound/usb/card.c
index a09e5f3519e3..7ecd0e8a5c51 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -680,6 +680,7 @@ static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message)
         struct snd_usb_audio *chip = usb_get_intfdata(intf);
         struct snd_usb_stream *as;
         struct usb_mixer_interface *mixer;
+        struct list_head *p;
 
         if (chip == (void *)-1L)
                 return 0;
@@ -692,6 +693,9 @@ static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message)
                                 as->substream[0].need_setup_ep =
                                         as->substream[1].need_setup_ep = true;
                         }
+                        list_for_each(p, &chip->midi_list) {
+                                snd_usbmidi_suspend(p);
+                        }
                 }
         } else {
                 /*
@@ -713,6 +717,7 @@ static int __usb_audio_resume(struct usb_interface *intf, bool reset_resume)
 {
         struct snd_usb_audio *chip = usb_get_intfdata(intf);
         struct usb_mixer_interface *mixer;
+        struct list_head *p;
         int err = 0;
 
         if (chip == (void *)-1L)
@@ -731,6 +736,10 @@ static int __usb_audio_resume(struct usb_interface *intf, bool reset_resume)
                         goto err_out;
         }
 
+        list_for_each(p, &chip->midi_list) {
+                snd_usbmidi_resume(p);
+        }
+
         if (!chip->autosuspended)
                 snd_power_change_state(chip->card, SNDRV_CTL_POWER_D0);
         chip->autosuspended = 0;
diff --git a/sound/usb/midi.c b/sound/usb/midi.c
index 9da74d2e8eee..9a4e82cf4ef9 100644
--- a/sound/usb/midi.c
+++ b/sound/usb/midi.c
@@ -2187,6 +2187,34 @@ void snd_usbmidi_input_start(struct list_head* p)
 EXPORT_SYMBOL(snd_usbmidi_input_start);
 
 /*
+ * Prepare for suspend. Typically called from the USB suspend callback.
+ */
+void snd_usbmidi_suspend(struct list_head *p)
+{
+        struct snd_usb_midi *umidi;
+
+        umidi = list_entry(p, struct snd_usb_midi, list);
+        mutex_lock(&umidi->mutex);
+        snd_usbmidi_input_stop(p);
+        mutex_unlock(&umidi->mutex);
+}
+EXPORT_SYMBOL(snd_usbmidi_suspend);
+
+/*
+ * Resume. Typically called from the USB resume callback.
+ */
+void snd_usbmidi_resume(struct list_head *p)
+{
+        struct snd_usb_midi *umidi;
+
+        umidi = list_entry(p, struct snd_usb_midi, list);
+        mutex_lock(&umidi->mutex);
+        snd_usbmidi_input_start(p);
+        mutex_unlock(&umidi->mutex);
+}
+EXPORT_SYMBOL(snd_usbmidi_resume);
+
+/*
  * Creates and registers everything needed for a MIDI streaming interface.
  */
 int snd_usbmidi_create(struct snd_card *card,
diff --git a/sound/usb/midi.h b/sound/usb/midi.h
index 2fca80b744c0..46e5b65e81e7 100644
--- a/sound/usb/midi.h
+++ b/sound/usb/midi.h
@@ -46,5 +46,7 @@ int snd_usbmidi_create(struct snd_card *card,
 void snd_usbmidi_input_stop(struct list_head* p);
 void snd_usbmidi_input_start(struct list_head* p);
 void snd_usbmidi_disconnect(struct list_head *p);
+void snd_usbmidi_suspend(struct list_head *p);
+void snd_usbmidi_resume(struct list_head *p);
 
 #endif /* __USBMIDI_H */