From f7881e5e8ef305e62084bf3d31b5b0d827fdf511 Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Tue, 5 Aug 2014 12:44:50 -0400 Subject: ALSA: usb-audio: Respond to suspend and resume callbacks for MIDI input sound/usb/card.c registers USB suspend and resume but did not previously kill the input URBs. This means that USB MIDI devices left open across suspend/resume had non-functional input (output still usually worked, but it looks like that is another issue). Before this change, we would get ESHUTDOWN for each of the input URBs at suspend time, killing input. Signed-off-by: Adam Goode Signed-off-by: Takashi Iwai --- sound/usb/midi.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'sound/usb/midi.c') 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 @@ -2186,6 +2186,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. */ -- cgit v1.2.3